From c2d4e9be7e9adc216d08e2871e97c739f28a91cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Sat, 4 Apr 2020 19:02:37 +0200
Subject: [PATCH] Integrate version 2.26.0
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>
---
GIT-VERSION-FILE | 2 +-
en/config.txt | 4 +-
en/diff-options.txt | 8 +-
en/fetch-options.txt | 5 +-
en/git-am.txt | 10 +-
en/git-check-ignore.txt | 12 +-
en/git-commit-tree.txt | 22 +-
en/git-commit.txt | 40 +-
en/git-config.txt | 15 +-
en/git-filter-branch.txt | 6 +-
en/git-grep.txt | 18 +-
en/git-ls-remote.txt | 4 +-
en/git-rebase.txt | 180 +-
en/git-rm.txt | 61 +-
en/git-stash.txt | 144 +-
en/git-submodule.txt | 8 +-
en/git-update-index.txt | 16 +
en/git.txt | 47 +-
en/pretty-formats.txt | 1 +
po/documentation.de.po | 2888 ++-
po/documentation.es.po | 39474 ++++++++++++-------------------
po/documentation.es_MX.po | 2709 ++-
po/documentation.fr.po | 3586 ++-
po/documentation.hu.po | 2701 ++-
po/documentation.id.po | 2701 ++-
po/documentation.it.po | 2709 ++-
po/documentation.ko.po | 2705 ++-
po/documentation.mr.po | 2705 ++-
po/documentation.nb_NO.po | 2701 ++-
po/documentation.nl.po | 2711 ++-
po/documentation.pl.po | 2705 ++-
po/documentation.pot | 2877 ++-
po/documentation.pt_BR.po | 2748 ++-
po/documentation.pt_PT.po | 2709 ++-
po/documentation.ru.po | 2899 ++-
po/documentation.tr.po | 2701 ++-
po/documentation.zh_HANS-CN.po | 2779 ++-
po/documentation.zh_HANT.po | 2715 ++-
38 files changed, 43953 insertions(+), 46373 deletions(-)
diff --git a/GIT-VERSION-FILE b/GIT-VERSION-FILE
index 35b6520..fb9a794 100644
--- a/GIT-VERSION-FILE
+++ b/GIT-VERSION-FILE
@@ -1 +1 @@
-GIT_VERSION = 2.25.0
+GIT_VERSION = 2.26.0
diff --git a/en/config.txt b/en/config.txt
index 83e7bba..08b13ba 100644
--- a/en/config.txt
+++ b/en/config.txt
@@ -263,7 +263,9 @@ color::
+
The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
`blue`, `magenta`, `cyan` and `white`. The first color given is the
-foreground; the second is the background.
+foreground; the second is the background. All the basic colors except
+`normal` have a bright variant that can be speficied by prefixing the
+color with `bright`, like `brightred`.
+
Colors may also be given as numbers between 0 and 255; these use ANSI
256-color mode (but note that not all terminals may support this). If
diff --git a/en/diff-options.txt b/en/diff-options.txt
index 09faee3..bb31f0c 100644
--- a/en/diff-options.txt
+++ b/en/diff-options.txt
@@ -567,13 +567,13 @@ To illustrate the difference between `-S<regex> --pickaxe-regex` and
file:
+
----
-+ return !regexec(regexp, two->ptr, 1, ®match, 0);
++ return frotz(nitfol, two->ptr, 1, 0);
...
-- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);
+- hit = frotz(nitfol, mf2.ptr, 1, 0);
----
+
-While `git log -G"regexec\(regexp"` will show this commit, `git log
--S"regexec\(regexp" --pickaxe-regex` will not (because the number of
+While `git log -G"frotz\(nitfol"` will show this commit, `git log
+-S"frotz\(nitfol" --pickaxe-regex` will not (because the number of
occurrences of that string did not change).
+
Unless `--text` is supplied patches of binary files without a textconv
diff --git a/en/fetch-options.txt b/en/fetch-options.txt
index a2f7862..a115a1a 100644
--- a/en/fetch-options.txt
+++ b/en/fetch-options.txt
@@ -139,7 +139,10 @@ ifndef::git-pull[]
specified refspec (can be given more than once) to map the
refs to remote-tracking branches, instead of the values of
`remote.*.fetch` configuration variables for the remote
- repository. See section on "Configured Remote-tracking
+ repository. Providing an empty `<refspec>` to the
+ `--refmap` option causes Git to ignore the configured
+ refspecs and rely entirely on the refspecs supplied as
+ command-line arguments. See section on "Configured Remote-tracking
Branches" for details.
-t::
diff --git a/en/git-am.txt b/en/git-am.txt
index 11ca61b..ab5754e 100644
--- a/en/git-am.txt
+++ b/en/git-am.txt
@@ -16,7 +16,7 @@ SYNOPSIS
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
[(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit | --show-current-patch)
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
DESCRIPTION
-----------
@@ -176,9 +176,11 @@ default. You can use `--no-utf8` to override this.
Abort the patching operation but keep HEAD and the index
untouched.
---show-current-patch::
- Show the entire e-mail message "git am" has stopped at, because
- of conflicts.
+--show-current-patch[=(diff|raw)]::
+ Show the message at which `git am` has stopped due to
+ conflicts. If `raw` is specified, show the raw contents of
+ the e-mail message; if `diff`, show the diff portion only.
+ Defaults to `raw`.
DISCUSSION
----------
diff --git a/en/git-check-ignore.txt b/en/git-check-ignore.txt
index 8b2d49c..0c3924a 100644
--- a/en/git-check-ignore.txt
+++ b/en/git-check-ignore.txt
@@ -30,9 +30,15 @@ OPTIONS
valid with a single pathname.
-v, --verbose::
- Also output details about the matching pattern (if any)
- for each given pathname. For precedence rules within and
- between exclude sources, see linkgit:gitignore[5].
+ Instead of printing the paths that are excluded, for each path
+ that matches an exclude pattern, print the exclude pattern
+ together with the path. (Matching an exclude pattern usually
+ means the path is excluded, but if the pattern begins with '!'
+ then it is a negated pattern and matching it means the path is
+ NOT excluded.)
++
+For precedence rules within and between exclude sources, see
+linkgit:gitignore[5].
--stdin::
Read pathnames from the standard input, one per line,
diff --git a/en/git-commit-tree.txt b/en/git-commit-tree.txt
index 4b90b9c..ec15ee8 100644
--- a/en/git-commit-tree.txt
+++ b/en/git-commit-tree.txt
@@ -69,7 +69,6 @@ OPTIONS
Do not GPG-sign commit, to countermand a `--gpg-sign` option
given earlier on the command line.
-
Commit Information
------------------
@@ -79,26 +78,6 @@ A commit encapsulates:
- author name, email and date
- committer name and email and the commit time.
-While parent object ids are provided on the command line, author and
-committer information is taken from the following environment variables,
-if set:
-
- GIT_AUTHOR_NAME
- GIT_AUTHOR_EMAIL
- GIT_AUTHOR_DATE
- GIT_COMMITTER_NAME
- GIT_COMMITTER_EMAIL
- GIT_COMMITTER_DATE
-
-(nb "<", ">" and "\n"s are stripped)
-
-In case (some of) these environment variables are not set, the information
-is taken from the configuration items user.name and user.email, or, if not
-present, the environment variable EMAIL, or, if that is not set,
-system user name and the hostname used for outgoing mail (taken
-from `/etc/mailname` and falling back to the fully qualified hostname when
-that file does not exist).
-
A commit comment is read from stdin. If a changelog
entry is not provided via "<" redirection, 'git commit-tree' will just wait
for one to be entered and terminated with ^D.
@@ -117,6 +96,7 @@ FILES
SEE ALSO
--------
linkgit:git-write-tree[1]
+linkgit:git-commit[1]
GIT
---
diff --git a/en/git-commit.txt b/en/git-commit.txt
index ced5a9b..13f6539 100644
--- a/en/git-commit.txt
+++ b/en/git-commit.txt
@@ -367,9 +367,6 @@ changes to tracked files.
+
For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
-:git-commit: 1
-include::date-formats.txt[]
-
EXAMPLES
--------
When recording your own work, the contents of modified files in
@@ -463,6 +460,43 @@ alter the order the changes are committed, because the merge
should be recorded as a single commit. In fact, the command
refuses to run when given pathnames (but see `-i` option).
+COMMIT INFORMATION
+------------------
+
+Author and committer information is taken from the following environment
+variables, if set:
+
+ GIT_AUTHOR_NAME
+ GIT_AUTHOR_EMAIL
+ GIT_AUTHOR_DATE
+ GIT_COMMITTER_NAME
+ GIT_COMMITTER_EMAIL
+ GIT_COMMITTER_DATE
+
+(nb "<", ">" and "\n"s are stripped)
+
+The author and committer names are by convention some form of a personal name
+(that is, the name by which other humans refer to you), although Git does not
+enforce or require any particular form. Arbitrary Unicode may be used, subject
+to the constraints listed above. This name has no effect on authentication; for
+that, see the `credential.username` variable in linkgit:git-config[1].
+
+In case (some of) these environment variables are not set, the information
+is taken from the configuration items `user.name` and `user.email`, or, if not
+present, the environment variable EMAIL, or, if that is not set,
+system user name and the hostname used for outgoing mail (taken
+from `/etc/mailname` and falling back to the fully qualified hostname when
+that file does not exist).
+
+The `author.name` and `committer.name` and their corresponding email options
+override `user.name` and `user.email` if set and are overridden themselves by
+the environment variables.
+
+The typical usage is to set just the `user.name` and `user.email` variables;
+the other options are provided for more complex use cases.
+
+:git-commit: 1
+include::date-formats.txt[]
DISCUSSION
----------
diff --git a/en/git-config.txt b/en/git-config.txt
index 899e92a..7573160 100644
--- a/en/git-config.txt
+++ b/en/git-config.txt
@@ -9,18 +9,18 @@ git-config - Get and set repository or global options
SYNOPSIS
--------
[verse]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]
'git config' [<file-option>] [--type=<type>] --add name value
'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]
'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL
'git config' [<file-option>] --unset name [value_regex]
'git config' [<file-option>] --unset-all name [value_regex]
'git config' [<file-option>] --rename-section old_name new_name
'git config' [<file-option>] --remove-section name
-'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list
+'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
'git config' [<file-option>] --get-color name [default]
'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
'git config' [<file-option>] -e | --edit
@@ -222,6 +222,11 @@ Valid `<type>`'s include:
the actual origin (config file path, ref, or blob id if
applicable).
+--show-scope::
+ Similar to `--show-origin` in that it augments the output of
+ all queried config options with the scope of that value
+ (local, global, system, command).
+
--get-colorbool name [stdout-is-tty]::
Find the color setting for `name` (e.g. `color.diff`) and output
diff --git a/en/git-filter-branch.txt b/en/git-filter-branch.txt
index a530fef..40ba4aa 100644
--- a/en/git-filter-branch.txt
+++ b/en/git-filter-branch.txt
@@ -467,9 +467,9 @@ impossible for a backward-compatible implementation to ever be fast:
* In editing files, git-filter-branch by design checks out each and
every commit as it existed in the original repo. If your repo has
- 10\^5 files and 10\^5 commits, but each commit only modifies 5
- files, then git-filter-branch will make you do 10\^10 modifications,
- despite only having (at most) 5*10^5 unique blobs.
+ `10^5` files and `10^5` commits, but each commit only modifies five
+ files, then git-filter-branch will make you do `10^10` modifications,
+ despite only having (at most) `5*10^5` unique blobs.
* If you try and cheat and try to make git-filter-branch only work on
files modified in a commit, then two things happen
diff --git a/en/git-grep.txt b/en/git-grep.txt
index c89fb56..ddb6acc 100644
--- a/en/git-grep.txt
+++ b/en/git-grep.txt
@@ -59,8 +59,8 @@ grep.extendedRegexp::
other than 'default'.
grep.threads::
- Number of grep worker threads to use. If unset (or set to 0),
- 8 threads are used by default (for now).
+ Number of grep worker threads to use. If unset (or set to 0), Git will
+ use as many threads as the number of logical cores available.
grep.fullName::
If set to true, enable `--full-name` option by default.
@@ -96,7 +96,8 @@ OPTIONS
Recursively search in each submodule that has been initialized and
checked out in the repository. When used in combination with the
<tree> option the prefix of all submodule output will be the name of
- the parent project's <tree> object.
+ the parent project's <tree> object. This option has no effect
+ if `--no-index` is given.
-a::
--text::
@@ -347,6 +348,17 @@ EXAMPLES
`git grep solution -- :^Documentation`::
Looks for `solution`, excluding files in `Documentation`.
+NOTES ON THREADS
+----------------
+
+The `--threads` option (and the grep.threads configuration) will be ignored when
+`--open-files-in-pager` is used, forcing a single-threaded execution.
+
+When grepping the object store (with `--cached` or giving tree objects), running
+with multiple threads might perform slower than single threaded if `--textconv`
+is given and there're too many text conversions. So if you experience low
+performance in this case, it might be desirable to use `--threads=1`.
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/en/git-ls-remote.txt b/en/git-ls-remote.txt
index a2ea1fd..0a5c8b7 100644
--- a/en/git-ls-remote.txt
+++ b/en/git-ls-remote.txt
@@ -28,7 +28,9 @@ OPTIONS
Limit to only refs/heads and refs/tags, respectively.
These options are _not_ mutually exclusive; when given
both, references stored in refs/heads and refs/tags are
- displayed.
+ displayed. Note that `git ls-remote -h` used without
+ anything else on the command line gives help, consistent
+ with other git subcommands.
--refs::
Do not show peeled tags or pseudorefs like `HEAD` in the output.
diff --git a/en/git-rebase.txt b/en/git-rebase.txt
index 0c4f038..f7a6033 100644
--- a/en/git-rebase.txt
+++ b/en/git-rebase.txt
@@ -258,16 +258,45 @@ See also INCOMPATIBLE OPTIONS below.
original branch. The index and working tree are also left
unchanged as a result.
---keep-empty::
- Keep the commits that do not change anything from its
- parents in the result.
+--apply:
+ Use applying strategies to rebase (calling `git-am`
+ internally). This option may become a no-op in the future
+ once the merge backend handles everything the apply one does.
++
+See also INCOMPATIBLE OPTIONS below.
+
+--empty={drop,keep,ask}::
+ How to handle commits that are not empty to start and are not
+ clean cherry-picks of any upstream commit, but which become
+ empty after rebasing (because they contain a subset of already
+ upstream changes). With drop (the default), commits that
+ become empty are dropped. With keep, such commits are kept.
+ With ask (implied by --interactive), the rebase will halt when
+ an empty commit is applied allowing you to choose whether to
+ drop it, edit files more, or just commit the empty changes.
+ Other options, like --exec, will use the default of drop unless
+ -i/--interactive is explicitly specified.
++
+Note that commits which start empty are kept, and commits which are
+clean cherry-picks (as determined by `git log --cherry-mark ...`) are
+always dropped.
+
See also INCOMPATIBLE OPTIONS below.
+--keep-empty::
+ No-op. Rebasing commits that started empty (had no change
+ relative to their parent) used to fail and this option would
+ override that behavior, allowing commits with empty changes to
+ be rebased. Now commits with no changes do not cause rebasing
+ to halt.
++
+See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below.
+
--allow-empty-message::
- By default, rebasing commits with an empty message will fail.
- This option overrides that behavior, allowing commits with empty
- messages to be rebased.
+ No-op. Rebasing commits with an empty message used to fail
+ and this option would override that behavior, allowing commits
+ with empty messages to be rebased. Now commits with an empty
+ message do not cause rebasing to halt.
+
See also INCOMPATIBLE OPTIONS below.
@@ -286,7 +315,7 @@ See also INCOMPATIBLE OPTIONS below.
--merge::
Use merging strategies to rebase. When the recursive (default) merge
strategy is used, this allows rebase to be aware of renames on the
- upstream side.
+ upstream side. This is the default.
+
Note that a rebase merge works by replaying each commit from the working
branch on top of the <upstream> branch. Because of this, when a merge
@@ -356,7 +385,7 @@ See also INCOMPATIBLE OPTIONS below.
Ensure at least <n> lines of surrounding context match before
and after each change. When fewer lines of surrounding
context exist they all must match. By default no context is
- ever ignored.
+ ever ignored. Implies --apply.
+
See also INCOMPATIBLE OPTIONS below.
@@ -394,8 +423,9 @@ with `--keep-base` in order to drop those commits from your branch.
--ignore-whitespace::
--whitespace=<option>::
- These flag are passed to the 'git apply' program
+ These flags are passed to the 'git apply' program
(see linkgit:git-apply[1]) that applies the patch.
+ Implies --apply.
+
See also INCOMPATIBLE OPTIONS below.
@@ -539,10 +569,11 @@ INCOMPATIBLE OPTIONS
The following options:
+ * --apply
* --committer-date-is-author-date
* --ignore-date
- * --whitespace
* --ignore-whitespace
+ * --whitespace
* -C
are incompatible with the following options:
@@ -557,6 +588,7 @@ are incompatible with the following options:
* --interactive
* --exec
* --keep-empty
+ * --empty=
* --edit-todo
* --root when used in combination with --onto
@@ -565,33 +597,137 @@ In addition, the following pairs of options are incompatible:
* --preserve-merges and --interactive
* --preserve-merges and --signoff
* --preserve-merges and --rebase-merges
+ * --preserve-merges and --empty=
* --keep-base and --onto
* --keep-base and --root
BEHAVIORAL DIFFERENCES
-----------------------
-There are some subtle differences how the backends behave.
+git rebase has two primary backends: apply and merge. (The apply
+backend used to known as the 'am' backend, but the name led to
+confusion as it looks like a verb instead of a noun. Also, the merge
+backend used to be known as the interactive backend, but it is now
+used for non-interactive cases as well. Both were renamed based on
+lower-level functionality that underpinned each.) There are some
+subtle differences in how these two backends behave:
Empty commits
~~~~~~~~~~~~~
-The am backend drops any "empty" commits, regardless of whether the
-commit started empty (had no changes relative to its parent to
-start with) or ended empty (all changes were already applied
-upstream in other commits).
+The apply backend unfortunately drops intentionally empty commits, i.e.
+commits that started empty, though these are rare in practice. It
+also drops commits that become empty and has no option for controlling
+this behavior.
-The interactive backend drops commits by default that
-started empty and halts if it hits a commit that ended up empty.
-The `--keep-empty` option exists for the interactive backend to allow
-it to keep commits that started empty.
+The merge backend keeps intentionally empty commits. Similar to the
+apply backend, by default the merge backend drops commits that become
+empty unless -i/--interactive is specified (in which case it stops and
+asks the user what to do). The merge backend also has an
+--empty={drop,keep,ask} option for changing the behavior of handling
+commits that become empty.
Directory rename detection
~~~~~~~~~~~~~~~~~~~~~~~~~~
-Directory rename heuristics are enabled in the merge and interactive
-backends. Due to the lack of accurate tree information, directory
-rename detection is disabled in the am backend.
+Due to the lack of accurate tree information (arising from
+constructing fake ancestors with the limited information available in
+patches), directory rename detection is disabled in the apply backend.
+Disabled directory rename detection means that if one side of history
+renames a directory and the other adds new files to the old directory,
+then the new files will be left behind in the old directory without
+any warning at the time of rebasing that you may want to move these
+files into the new directory.
+
+Directory rename detection works with the merge backend to provide you
+warnings in such cases.
+
+Context
+~~~~~~~
+
+The apply backend works by creating a sequence of patches (by calling
+`format-patch` internally), and then applying the patches in sequence
+(calling `am` internally). Patches are composed of multiple hunks,
+each with line numbers, a context region, and the actual changes. The
+line numbers have to be taken with some fuzz, since the other side
+will likely have inserted or deleted lines earlier in the file. The
+context region is meant to help find how to adjust the line numbers in
+order to apply the changes to the right lines. However, if multiple
+areas of the code have the same surrounding lines of context, the
+wrong one can be picked. There are real-world cases where this has
+caused commits to be reapplied incorrectly with no conflicts reported.
+Setting diff.context to a larger value may prevent such types of
+problems, but increases the chance of spurious conflicts (since it
+will require more lines of matching context to apply).
+
+The merge backend works with a full copy of each relevant file,
+insulating it from these types of problems.
+
+Labelling of conflicts markers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When there are content conflicts, the merge machinery tries to
+annotate each side's conflict markers with the commits where the
+content came from. Since the apply backend drops the original
+information about the rebased commits and their parents (and instead
+generates new fake commits based off limited information in the
+generated patches), those commits cannot be identified; instead it has
+to fall back to a commit summary. Also, when merge.conflictStyle is
+set to diff3, the apply backend will use "constructed merge base" to
+label the content from the merge base, and thus provide no information
+about the merge base commit whatsoever.
+
+The merge backend works with the full commits on both sides of history
+and thus has no such limitations.
+
+Hooks
+~~~~~
+
+The apply backend has not traditionally called the post-commit hook,
+while the merge backend has. However, this was by accident of
+implementation rather than by design. Both backends should have the
+same behavior, though it is not clear which one is correct.
+
+Interruptability
+~~~~~~~~~~~~~~~~
+
+The apply backend has safety problems with an ill-timed interrupt; if
+the user presses Ctrl-C at the wrong time to try to abort the rebase,
+the rebase can enter a state where it cannot be aborted with a
+subsequent `git rebase --abort`. The merge backend does not appear to
+suffer from the same shortcoming. (See
+https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for
+details.)
+
+Commit Rewording
+~~~~~~~~~~~~~~~~
+
+When a conflict occurs while rebasing, rebase stops and asks the user
+to resolve. Since the user may need to make notable changes while
+resolving conflicts, after conflicts are resolved and the user has run
+`git rebase --continue`, the rebase should open an editor and ask the
+user to update the commit message. The merge backend does this, while
+the apply backend blindly applies the original commit message.
+
+Miscellaneous differences
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are a few more behavioral differences that most folks would
+probably consider inconsequential but which are mentioned for
+completeness:
+
+* Reflog: The two backends will use different wording when describing
+ the changes made in the reflog, though both will make use of the
+ word "rebase".
+
+* Progress, informational, and error messages: The two backends
+ provide slightly different progress and informational messages.
+ Also, the apply backend writes error messages (such as "Your files
+ would be overwritten...") to stdout, while the merge backend writes
+ them to stderr.
+
+* State directories: The two backends keep their state in different
+ directories under .git/
include::merge-strategies.txt[]
diff --git a/en/git-rm.txt b/en/git-rm.txt
index b5c4622..ab75036 100644
--- a/en/git-rm.txt
+++ b/en/git-rm.txt
@@ -8,16 +8,18 @@ git-rm - Remove files from the working tree and from the index
SYNOPSIS
--------
[verse]
-'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
+'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]
+ [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+ [--] [<pathspec>...]
DESCRIPTION
-----------
-Remove files from the index, or from the working tree and the index.
-`git rm` will not remove a file from just your working directory.
-(There is no option to remove a file only from the working tree
-and yet keep it in the index; use `/bin/rm` if you want to do that.)
-The files being removed have to be identical to the tip of the branch,
-and no updates to their contents can be staged in the index,
+Remove files matching pathspec from the index, or from the working tree
+and the index. `git rm` will not remove a file from just your working
+directory. (There is no option to remove a file only from the working
+tree and yet keep it in the index; use `/bin/rm` if you want to do
+that.) The files being removed have to be identical to the tip of the
+branch, and no updates to their contents can be staged in the index,
though that default behavior can be overridden with the `-f` option.
When `--cached` is given, the staged content has to
match either the tip of the branch or the file on disk,
@@ -26,15 +28,20 @@ allowing the file to be removed from just the index.
OPTIONS
-------
-<file>...::
- Files to remove. Fileglobs (e.g. `*.c`) can be given to
- remove all matching files. If you want Git to expand
- file glob characters, you may need to shell-escape them.
- A leading directory name
- (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be
- given to remove all files in the directory, and recursively
- all sub-directories,
- but this requires the `-r` option to be explicitly given.
+<pathspec>...::
+ Files to remove. A leading directory name (e.g. `dir` to remove
+ `dir/file1` and `dir/file2`) can be given to remove all files in
+ the directory, and recursively all sub-directories, but this
+ requires the `-r` option to be explicitly given.
++
+The command removes only the paths that are known to Git.
++
+File globbing matches across directory boundaries. Thus, given two
+directories `d` and `d2`, there is a difference between using
+`git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all
+of directory `d2`.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
-f::
--force::
@@ -68,19 +75,19 @@ OPTIONS
`git rm` normally outputs one line (in the form of an `rm` command)
for each file removed. This option suppresses that output.
+--pathspec-from-file=<file>::
+ Pathspec is passed in `<file>` instead of commandline args. If
+ `<file>` is exactly `-` then standard input is used. Pathspec
+ elements are separated by LF or CR/LF. Pathspec elements can be
+ quoted as explained for the configuration variable `core.quotePath`
+ (see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+ global `--literal-pathspecs`.
-DISCUSSION
-----------
-
-The <file> list given to the command can be exact pathnames,
-file glob patterns, or leading directory names. The command
-removes only the paths that are known to Git. Giving the name of
-a file that you have not told Git about does not remove that file.
+--pathspec-file-nul::
+ Only meaningful with `--pathspec-from-file`. Pathspec elements are
+ separated with NUL character and all other characters are taken
+ literally (including newlines and quotes).
-File globbing matches across directory boundaries. Thus, given
-two directories `d` and `d2`, there is a difference between
-using `git rm 'd*'` and `git rm 'd/*'`, as the former will
-also remove all of directory `d2`.
REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM
--------------------------------------------------------
diff --git a/en/git-stash.txt b/en/git-stash.txt
index 53e1a12..31f1beb 100644
--- a/en/git-stash.txt
+++ b/en/git-stash.txt
@@ -15,6 +15,7 @@ SYNOPSIS
'git stash' branch <branchname> [<stash>]
'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [-m|--message <message>]
+ [--pathspec-from-file=<file> [--pathspec-file-nul]]
[--] [<pathspec>...]]
'git stash' clear
'git stash' create [<message>]
@@ -43,10 +44,10 @@ created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}`
is also possible). Stashes may also be referenced by specifying just the
stash index (e.g. the integer `n` is equivalent to `stash@{n}`).
-OPTIONS
--------
+COMMANDS
+--------
-push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]::
+push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]::
Save your local modifications to a new 'stash entry' and roll them
back to HEAD (in the working tree and in the index).
@@ -56,38 +57,13 @@ push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
For quickly making a snapshot, you can omit "push". In this mode,
non-option arguments are not allowed to prevent a misspelled
subcommand from making an unwanted stash entry. The two exceptions to this
-are `stash -p` which acts as alias for `stash push -p` and pathspecs,
+are `stash -p` which acts as alias for `stash push -p` and pathspec elements,
which are allowed after a double hyphen `--` for disambiguation.
-+
-When pathspec is given to 'git stash push', the new stash entry records the
-modified states only for the files that match the pathspec. The index
-entries and working tree files are then rolled back to the state in
-HEAD only for these files, too, leaving files that do not match the
-pathspec intact.
-+
-If the `--keep-index` option is used, all changes already added to the
-index are left intact.
-+
-If the `--include-untracked` option is used, all untracked files are also
-stashed and then cleaned up with `git clean`, leaving the working directory
-in a very clean state. If the `--all` option is used instead then the
-ignored files are stashed and cleaned in addition to the untracked files.
-+
-With `--patch`, you can interactively select hunks from the diff
-between HEAD and the working tree to be stashed. The stash entry is
-constructed such that its index state is the same as the index state
-of your repository, and its worktree contains only the changes you
-selected interactively. The selected changes are then rolled back
-from your worktree. See the ``Interactive Mode'' section of
-linkgit:git-add[1] to learn how to operate the `--patch` mode.
-+
-The `--patch` option implies `--keep-index`. You can use
-`--no-keep-index` to override this.
save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
This option is deprecated in favour of 'git stash push'. It
- differs from "stash push" in that it cannot take pathspecs.
+ differs from "stash push" in that it cannot take pathspec.
Instead, all non-option arguments are concatenated to form the stash
message.
@@ -111,7 +87,7 @@ show [<options>] [<stash>]::
Show the changes recorded in the stash entry as a diff between the
stashed contents and the commit back when the stash entry was first
- created. When no `<stash>` is given, it shows the latest one.
+ created.
By default, the command shows the diffstat, but it will accept any
format known to 'git diff' (e.g., `git stash show -p stash@{1}`
to view the second most recent entry in patch form).
@@ -128,14 +104,6 @@ pop [--index] [-q|--quiet] [<stash>]::
Applying the state can fail with conflicts; in this case, it is not
removed from the stash list. You need to resolve the conflicts by hand
and call `git stash drop` manually afterwards.
-+
-If the `--index` option is used, then tries to reinstate not only the working
-tree's changes, but also the index's ones. However, this can fail, when you
-have conflicts (which are stored in the index, where you therefore can no
-longer apply the changes as they were originally).
-+
-When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must
-be a reference of the form `stash@{<revision>}`.
apply [--index] [-q|--quiet] [<stash>]::
@@ -149,8 +117,7 @@ branch <branchname> [<stash>]::
the commit at which the `<stash>` was originally created, applies the
changes recorded in `<stash>` to the new working tree and index.
If that succeeds, and `<stash>` is a reference of the form
- `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>`
- is given, applies the latest one.
+ `stash@{<revision>}`, it then drops the `<stash>`.
+
This is useful if the branch on which you ran `git stash push` has
changed enough that `git stash apply` fails due to conflicts. Since
@@ -166,9 +133,6 @@ clear::
drop [-q|--quiet] [<stash>]::
Remove a single stash entry from the list of stash entries.
- When no `<stash>` is given, it removes the latest one.
- i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash
- log reference of the form `stash@{<revision>}`.
create::
@@ -185,6 +149,98 @@ store::
reflog. This is intended to be useful for scripts. It is
probably not the command you want to use; see "push" above.
+OPTIONS
+-------
+-a::
+--all::
+ This option is only valid for `push` and `save` commands.
++
+All ignored and untracked files are also stashed and then cleaned
+up with `git clean`.
+
+-u::
+--include-untracked::
+ This option is only valid for `push` and `save` commands.
++
+All untracked files are also stashed and then cleaned up with
+`git clean`.
+
+--index::
+ This option is only valid for `pop` and `apply` commands.
++
+Tries to reinstate not only the working tree's changes, but also
+the index's ones. However, this can fail, when you have conflicts
+(which are stored in the index, where you therefore can no longer
+apply the changes as they were originally).
+
+-k::
+--keep-index::
+--no-keep-index::
+ This option is only valid for `push` and `save` commands.
++
+All changes already added to the index are left intact.
+
+-p::
+--patch::
+ This option is only valid for `push` and `save` commands.
++
+Interactively select hunks from the diff between HEAD and the
+working tree to be stashed. The stash entry is constructed such
+that its index state is the same as the index state of your
+repository, and its worktree contains only the changes you selected
+interactively. The selected changes are then rolled back from your
+worktree. See the ``Interactive Mode'' section of linkgit:git-add[1]
+to learn how to operate the `--patch` mode.
++
+The `--patch` option implies `--keep-index`. You can use
+`--no-keep-index` to override this.
+
+--pathspec-from-file=<file>::
+ This option is only valid for `push` command.
++
+Pathspec is passed in `<file>` instead of commandline args. If
+`<file>` is exactly `-` then standard input is used. Pathspec
+elements are separated by LF or CR/LF. Pathspec elements can be
+quoted as explained for the configuration variable `core.quotePath`
+(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+ This option is only valid for `push` command.
++
+Only meaningful with `--pathspec-from-file`. Pathspec elements are
+separated with NUL character and all other characters are taken
+literally (including newlines and quotes).
+
+-q::
+--quiet::
+ This option is only valid for `apply`, `drop`, `pop`, `push`,
+ `save`, `store` commands.
++
+Quiet, suppress feedback messages.
+
+\--::
+ This option is only valid for `push` command.
++
+Separates pathspec from options for disambiguation purposes.
+
+<pathspec>...::
+ This option is only valid for `push` command.
++
+The new stash entry records the modified states only for the files
+that match the pathspec. The index entries and working tree files
+are then rolled back to the state in HEAD only for these files,
+too, leaving files that do not match the pathspec intact.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
+
+<stash>::
+ This option is only valid for `apply`, `branch`, `drop`, `pop`,
+ `show` commands.
++
+A reference of the form `stash@{<revision>}`. When no `<stash>` is
+given, the latest stash is assumed (that is, `stash@{0}`).
+
DISCUSSION
----------
diff --git a/en/git-submodule.txt b/en/git-submodule.txt
index 5232407..c9ed2bf 100644
--- a/en/git-submodule.txt
+++ b/en/git-submodule.txt
@@ -133,7 +133,7 @@ If you really want to remove a submodule from the repository and commit
that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal
options.
-update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]::
+update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]::
+
--
Update the registered submodules to match what the superproject
@@ -229,7 +229,7 @@ As an example, the command below will show the path and currently
checked out commit for each submodule:
+
--------------
-git submodule foreach 'echo $path `git rev-parse HEAD`'
+git submodule foreach 'echo $sm_path `git rev-parse HEAD`'
--------------
sync [--recursive] [--] [<path>...]::
@@ -430,6 +430,10 @@ options carefully.
Clone new submodules in parallel with as many jobs.
Defaults to the `submodule.fetchJobs` option.
+--[no-]single-branch::
+ This option is only valid for the update command.
+ Clone only one branch during update: HEAD or one specified by --branch.
+
<path>...::
Paths to submodule(s). When specified this will restrict the command
to only operate on the submodules found at the specified paths.
diff --git a/en/git-update-index.txt b/en/git-update-index.txt
index c7a6271..1489cb0 100644
--- a/en/git-update-index.txt
+++ b/en/git-update-index.txt
@@ -549,6 +549,22 @@ The untracked cache extension can be enabled by the
`core.untrackedCache` configuration variable (see
linkgit:git-config[1]).
+NOTES
+-----
+
+Users often try to use the assume-unchanged and skip-worktree bits
+to tell Git to ignore changes to files that are tracked. This does not
+work as expected, since Git may still check working tree files against
+the index when performing certain operations. In general, Git does not
+provide a way to ignore changes to tracked files, so alternate solutions
+are recommended.
+
+For example, if the file you want to change is some sort of config file,
+the repository can include a sample config file that can then be copied
+into the ignored name and modified. The repository can even include a
+script to treat the sample file as a template, modifying and copying it
+automatically.
+
SEE ALSO
--------
linkgit:git-config[1],
diff --git a/en/git.txt b/en/git.txt
index b1597ac..b0672bd 100644
--- a/en/git.txt
+++ b/en/git.txt
@@ -110,9 +110,23 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config
Do not pipe Git output into a pager.
--git-dir=<path>::
- Set the path to the repository. This can also be controlled by
- setting the `GIT_DIR` environment variable. It can be an absolute
- path or relative path to current working directory.
+ Set the path to the repository (".git" directory). This can also be
+ controlled by setting the `GIT_DIR` environment variable. It can be
+ an absolute path or relative path to current working directory.
++
+Specifying the location of the ".git" directory using this
+option (or `GIT_DIR` environment variable) turns off the
+repository discovery that tries to find a directory with
+".git" subdirectory (which is how the repository and the
+top-level of the working tree are discovered), and tells Git
+that you are at the top level of the working tree. If you
+are not at the top-level directory of the working tree, you
+should tell Git where the top-level of the working tree is,
+with the `--work-tree=<path>` option (or `GIT_WORK_TREE`
+environment variable)
++
+If you just want to run git as if it was started in `<path>` then use
+`git -C <path>`.
--work-tree=<path>::
Set the path to the working tree. It can be an absolute path
@@ -482,13 +496,36 @@ double-quotes and respecting backslash escapes. E.g., the value
Git Commits
~~~~~~~~~~~
`GIT_AUTHOR_NAME`::
+ The human-readable name used in the author identity when creating commit or
+ tag objects, or when writing reflogs. Overrides the `user.name` and
+ `author.name` configuration settings.
+
`GIT_AUTHOR_EMAIL`::
+ The email address used in the author identity when creating commit or
+ tag objects, or when writing reflogs. Overrides the `user.email` and
+ `author.email` configuration settings.
+
`GIT_AUTHOR_DATE`::
+ The date used for the author identity when creating commit or tag objects, or
+ when writing reflogs. See linkgit:git-commit[1] for valid formats.
+
`GIT_COMMITTER_NAME`::
+ The human-readable name used in the committer identity when creating commit or
+ tag objects, or when writing reflogs. Overrides the `user.name` and
+ `committer.name` configuration settings.
+
`GIT_COMMITTER_EMAIL`::
+ The email address used in the author identity when creating commit or
+ tag objects, or when writing reflogs. Overrides the `user.email` and
+ `committer.email` configuration settings.
+
`GIT_COMMITTER_DATE`::
-'EMAIL'::
- see linkgit:git-commit-tree[1]
+ The date used for the committer identity when creating commit or tag objects, or
+ when writing reflogs. See linkgit:git-commit[1] for valid formats.
+
+`EMAIL`::
+ The email address used in the author and committer identities if no other
+ relevant environment variable or configuration setting has been set.
Git Diffs
~~~~~~~~~
diff --git a/en/pretty-formats.txt b/en/pretty-formats.txt
index 1a7212c..a4b6f49 100644
--- a/en/pretty-formats.txt
+++ b/en/pretty-formats.txt
@@ -226,6 +226,7 @@ endif::git-rev-list[]
'%GF':: show the fingerprint of the key used to sign a signed commit
'%GP':: show the fingerprint of the primary key whose subkey was used
to sign a signed commit
+'%GT':: show the trust level for the key used to sign a signed commit
'%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2
minutes ago}`; the format follows the rules described for the
`-g` option. The portion before the `@` is the refname as
diff --git a/po/documentation.de.po b/po/documentation.de.po
index 46397eb..f3c47b3 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-04-03 22:30+0000\n"
"Last-Translator: Dieter Ziller <max123kl@ziller.de>\n"
"Language-Team: Matthias A횩hauer <mha1993@live.de>\n"
@@ -34,7 +34,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr "Leere SHA-1 f체r Grenz-Commits anzeigen. Kann auch 체ber die Option `blame.blankboundary` gesteuert werden."
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -82,7 +82,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr "<Anfang> und <Ende> sind optional.``-L <Anfang>'' oder ``-L <Anfang>,'' geht von <Anfang> bis zum Dateiende. ``-L ,<Ende>'' geht vom Dateianfang bis <Ende>."
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -94,7 +94,7 @@ msgid "Show long rev (Default: off)."
msgstr "Zeige lange Revisionsnummer an (Standard: aus)."
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -130,7 +130,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr "Den Verlauf vorw채rts statt r체ckw채rts durchgehen. Anstatt die erste Revision anzuzeigen, in der eine Zeile erschien, wird die letzte Revision angezeigt, in der die Zeile noch existierte. Dies erfordert einen Revisionsbereich wie ANFANG..ENDE, wobei die gesuchte Stelle in ANFANG existieren muss. `git blame --reverse ANFANG` ist die Abk체rzung f체r `git blame --reverse ANFANG..HEAD`."
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -280,7 +280,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -712,7 +712,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr "Bidirektionale Operationen zwischen einem Subversion-Repository und Git."
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1659,8 +1659,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr "Den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren."
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2468,62 +2468,62 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, fuzzy, no-wrap, priority:100
#| msgid "<branchname>"
msgid "pathname"
msgstr "<branchname>"
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3557,7 +3557,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3569,13 +3569,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4036,7 +4036,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4068,7 +4068,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4104,7 +4104,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, fuzzy, no-wrap, priority:280
#| msgid "--color"
msgid "--color[=<when>]"
@@ -4125,7 +4125,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4737,15 +4737,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4876,13 +4876,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4918,7 +4918,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4960,13 +4960,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4978,7 +4978,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4990,7 +4990,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5026,13 +5026,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5122,7 +5122,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5254,7 +5254,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr "Siehe auch die Konfigurationsvariable `fetch.negotiationAlgorithm`, die in linkgit:git-config[1] dokumentiert ist."
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5266,13 +5266,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5304,7 +5304,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5376,7 +5376,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr "-P"
@@ -5394,7 +5394,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5418,259 +5418,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr "--jobs=<Anz>"
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr "--submodule-prefix=<Pfad>"
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <upload-pack>"
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr "Wird diese Option angegeben und das anzufordernde Repository mit 'git fetch-pack' gehandhabt wird, wird dem Befehl `--exec=<upload-pack>` 체bergeben, um den auf der entfernten Seite auszuf체hrenden Befehl anzugeben."
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "Gib ausf체hrliche Informationen aus."
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "Der Fortschritt wird standardm채횩ig auf der Standardfehlerausgabe angezeigt, wenn diese an ein Terminal angebunden ist, au횩er wenn -q angegeben ist. Dieses Flag erzwingt die Fortschrittsanzeige auch ohne Terminalanbindung."
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr "-o <Option>"
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--server-option=<Option>"
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
-msgstr ""
-"횥bertragen Sie die angegebene Zeichenfolge an den Server, wenn Sie mit "
-"Protokollversion 2 arbeiten. Die 체bergebene Zeichenfolge darf kein NUL- oder "
-"LF-Zeichen enthalten. Die Verarbeitung von Server-Optionen, einschlie횩lich "
-"unbekannter Optionen, durch den Server ist serverspezifisch. Wenn mehrere "
-"`--server-option=<option>` 체bergeben werden, werden sie alle, nacheinander, "
-"wie in der Befehlszeile angegeben, an die andere Seite gesendet."
+msgstr "횥bertragen Sie die angegebene Zeichenfolge an den Server, wenn Sie mit Protokollversion 2 arbeiten. Die 체bergebene Zeichenfolge darf kein NUL- oder LF-Zeichen enthalten. Die Verarbeitung von Server-Optionen, einschlie횩lich unbekannter Optionen, durch den Server ist serverspezifisch. Wenn mehrere `--server-option=<option>` 체bergeben werden, werden sie alle, nacheinander, wie in der Befehlszeile angegeben, an die andere Seite gesendet."
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5720,7 +5714,7 @@ msgstr ""
"\t [--chmod=(+|-)x] [--] [<Pfadspezifikation>...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "BESCHREIBUNG"
@@ -5762,13 +5756,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "F체r andere Wege, Inhalte zu einer Eintragung (commit) hinzuzuf체gen, siehe auch linkgit:git-commit[1] ."
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OPTIONEN"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<Pfadspezifikation>..."
@@ -5780,7 +5774,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "F체r mehr Detail 체ber die <pathspec> Syntax kann der 'pathspec' Eintrag im linkgit:gitglossary[7] zur Rate gezogen werden."
@@ -5798,13 +5792,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "Erzwinge das Hinzuf체gen normalerweise ignorierter Dateien."
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5828,13 +5822,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -6008,43 +6002,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr "--pathspec-from-file=<Datei>"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr "Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit Befehlszeilenoptionen verwechselt werden k철nnten."
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "EXAMPLES"
@@ -6086,7 +6080,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr "Dieses Beispiel l채횩t die Erweiterung des Sternchens durch die Shell durchf체hren (git erh채lt bereits eine explizite Dateiliste 체bergeben), und so kann z.B. `subdir/git-foo.sh` nicht gefunden werden."
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "INTERAKTIVER MODUS"
@@ -6422,7 +6416,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
@@ -6434,13 +6428,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr "Teil der linkgit:git[1] Suite"
@@ -6468,7 +6462,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6490,7 +6484,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6532,7 +6526,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6562,7 +6556,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6654,37 +6648,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr "--whitespace=<Option>"
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr "-C<Anz>"
@@ -6744,7 +6738,7 @@ msgid "Run interactively."
msgstr "Interaktiv ausf체hren."
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6756,7 +6750,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6768,7 +6762,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6780,19 +6774,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6804,7 +6798,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6858,115 +6852,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr "ER횜RTERUNG"
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr "HOOKS"
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr "Dieser Befehl kann die folgenden Hooks aufrufen: `applypatch-msg`, `pre-applypatch`, und `post-applypatch`. Siehe linkgit:githooks[5] f체r weitere Information."
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -7052,7 +7047,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr "Die Dateien, aus denen die Patches gelesen werden sollen. '-' kann verwendet werden um von der Standardeingabe zu lesen."
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7082,8 +7077,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7094,7 +7089,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7166,7 +7161,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7189,8 +7184,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7382,7 +7377,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7412,7 +7407,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7552,7 +7547,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7743,7 +7738,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr "<Commit-Referenz>"
@@ -9219,15 +9214,7 @@ msgstr "Beachten Sie, dass dies einen neuen Branch anlegt, aber der aktuelle Arb
#: en/git-branch.txt:73
#, priority:240
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
-msgstr ""
-"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."
+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
@@ -9332,7 +9319,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr "Kopiere einen Branch und das zugeh철rige Reflog."
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr "-C"
@@ -9356,7 +9343,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
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:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9645,12 +9632,10 @@ msgstr "<Neuer-Branch>"
#: en/git-branch.txt:280
#, priority:240
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>."
+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:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9782,7 +9767,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10201,7 +10186,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr "<Objekt>"
@@ -10237,7 +10222,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr "<Art>"
@@ -10456,7 +10441,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10780,13 +10765,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10876,7 +10861,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -11027,127 +11012,133 @@ msgid "-v, --verbose"
msgstr "-v --verbose"
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11626,7 +11617,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr "Leise, unterdr체cke Hinweisnachrichten."
@@ -11641,11 +11632,7 @@ msgstr "--no-progress"
#: en/git-checkout.txt:117 en/git-restore.txt:75 en/git-switch.txt:150
#, priority:240
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
-msgstr ""
-"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."
+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."
#. type: Plain text
#: en/git-checkout.txt:123
@@ -11822,7 +11809,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -12010,7 +11997,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, fuzzy, priority:280
#| msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
@@ -12312,10 +12299,10 @@ msgstr "$ git checkout mytopic\n"
msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
msgstr "Der \"falsche\" Branch und der korrekte Branch \"mytopic\" k철nnen sich in lokal ge채nderten Dateien unterscheiden, was daz f체hrt, dass der obige Checkout folgenderma횩en fehlschl채gt:"
+#. type: delimited block -
# git-checkout.txt is not up to date. The fuzzy msgid is the message prior to 142183d0 2010-07-09 "checkout: accord documentation to what git does", the msgid is the message in the documentation afterwards.
# At that time there weren't even po files in the git tree. This message does not exist since 23cbf11b 2010-08-11 "merge-recursive: porcelain messages for checkout".
# The current message is "Your local changes to the following files would be overwritten by merge:\n%%s" as of 2e3926b9 2016-05-13 "i18n: unpack-trees: avoid substituting only a verb in sentences"
-#. type: delimited block -
#: en/git-checkout.txt:561
#, fuzzy, no-wrap, priority:240
#| msgid ""
@@ -12783,7 +12770,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12807,7 +12794,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -13033,7 +13020,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr "<Branch>"
@@ -13477,12 +13464,7 @@ msgstr ""
#: en/git-clone.txt:29
#, priority:300
msgid "Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository (visible using `git branch --remotes`), and creates and checks out an initial branch that is forked from the cloned repository's currently active branch."
-msgstr ""
-"Klont ein Repository in ein neu erzeugtes Verzeichnis, erzeugt Remote-"
-"Tracking-Branches zum Nachverfolgen aller Branches des geklonten "
-"Repositories (sichtbar durch `git branch --remotes`). Zus채tzlich wird der "
-"gerade aktive Branch des geklonten Projektarchivs lokal angelegt und dessen "
-"Inhalte geholt."
+msgstr "Klont ein Repository in ein neu erzeugtes Verzeichnis, erzeugt Remote-Tracking-Branches zum Nachverfolgen aller Branches des geklonten Repositories (sichtbar durch `git branch --remotes`). Zus채tzlich wird der gerade aktive Branch des geklonten Projektarchivs lokal angelegt und dessen Inhalte geholt."
#. type: Plain text
#: en/git-clone.txt:35
@@ -13631,7 +13613,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr "Unterdr체cke das Abrufen (checkout) von HEAD nachdem das Klonen fertig ist."
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13777,7 +13759,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13873,7 +13855,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr "<Repository>"
@@ -14186,7 +14168,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr "<Tree>"
@@ -14246,90 +14228,66 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, fuzzy, no-wrap, priority:100
#| msgid "Configuration"
msgid "Commit Information"
msgstr "Configuration"
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, fuzzy, no-wrap, priority:100
msgid "Discussion"
msgstr "Discussion"
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr "FILES"
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14548,7 +14506,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14644,7 +14602,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14959,14 +14917,14 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr "Werden in der Befehlszeile Dateien angegeben, so wird der Inhalt dieser Dateien eingetragen, ohne die bereits im Index vorbereiteten 횆nderungen aufzuzeichnen. Die Dateiinhalte werden au횩erdem f체r die n채chste Eintragung im Index bereitgestellt (zus채tzlich zu den dort bereits vorbereiteten 횆nderungen)."
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, fuzzy, priority:280
#| msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git-add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git reset HEAD -- <file>`, which effectively reverts 'git-add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr "Beim Aufzeichnen der eigenen Arbeit, wird der Inhalt der ver채nderten Dateien im Arbeitsbereich mit 'git add' tempor채r in einem Zwischenbereich (\"Index\" genannt) abgelegt. Die mit 'git add' vorbereiteten 횆nderungen einer Datei k철nnen mit `git reset HEAD -- <file>` wieder aus dem Index entfernt werden, ohne dadurch die Datei selbst zu ver채ndern. Nachdem die gew체nschten 횆nderungen im Index vorbereitet wurden kann dieser mit dem 'git commit' Befehl im Projektarchiv eingetragen (commited) werden. Ein Beispiel:"
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14980,13 +14938,13 @@ msgstr ""
"$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr "Anstatt die Dateien nach jeder 횆nderung einzeln im Index vorzubereiten kann man 'git commit' anweisen die 횆nderungen aller aktuell in git verwalteten Dateien selbst채ndig mit 'git add' und 'git rm' vorzubereiten. Wurden keine anderen Dateien im Arbeitsbereich ge채ndert, erzielt das diese Beispiel das gleiche Resultat wie das vorhergehende Beispiel:"
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14998,19 +14956,19 @@ msgstr ""
"$ git commit -a\n"
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr "Der Befehl 'git commit -a' betrachtet zuerst den Arbeitsbereich, erkennt das hello.c ge채ndert und goodbye.c entfernt wurden, und f체hrt intern die notwendigen 'git add' und 'git rm' funktionen aus."
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr "Wurden im Index 횆nderungen an mehreren Dateien vorbereitet, kann die Reihenfolge in der diese 횆nderungen eingetragen (commited) werden, durch die Angabege einzelner Dateipfade ge채ndert werden. Werden Dateipfade angegeben, tr채gt der Befehl ausschlie횩lich 횆nderungen dieser Dateien im Projektarchiv ein:"
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -15024,32 +14982,32 @@ msgstr ""
"$ git commit Makefile\n"
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr "Die hier erzeugte Eintragung (commit) enth채lt ausschlie횩lich die 횆nderungen der Datei 'Makefile'. Die vorbereiteten 횆nderungen an 'hello.c' und 'hello.h' sind in dieser Eintragung nicht enthalten, sie bleiben allerdings weiterhin im Index vorbereitet und gehen nicht verloren. Wird anschlie횩end der folgende Befehl aufgerufen:"
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr "$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr "werden in einer zweiten Eintragung (commit) die 횆nderungen an 'hello.c' und 'hello.h' im Projektarchiv eingetragen."
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, fuzzy, priority:280
#| msgid "After a merge (initiated by 'git-merge' or 'git-pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git-status' and after fixing them manually in your working tree, you would stage the result as usual with 'git-add':"
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr "Nach einer Zusammenf체hrung (merge, durchgef체hrt mit 'git-merge' oder 'git-pull') die Aufgrund von Konflikten abgebrochen wird, sind sauber zusammengef체hrte Pfade bereits im Index vorbereitet und k철nnten eingetragen (commited) werden. Alle Pfade mit Konflikten bleiben im nicht zusammengef체hrten Zustand. Mittels 'git status' kann 체berpr체ft werden, welche Dateipfade die Konflikte enthalten. Nachdem die Konflikte im Arbeitsbereich manuell aufgel철st wurden k철nnen die betroffenen Dateien wie gewohnt mit 'git add' im Index f체r die Eintragung vorbereitet werden:"
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -15063,58 +15021,114 @@ msgstr ""
"$ git add hello.c\n"
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr "Nachdem die Konflikte aufgel철st und im Index vorbereitet wurden zeigt 'git ls-files -u' die betreffenden Dateipfade nicht mehr an. Durch 'git commit' k철nnen die 횆nderungen abschlie횩end im Projektarchiv eingetragen (commited) werden:"
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr "Mann kann die '-a' Option allerdings auch einfach dazu verwenden um weniger tippen zu m체ssen. Eine Einschr채nkung besteht allerdings dahingehend, da횩 dies bei einer Zusammenf체hrung (merge) nicht verwendet werden kann, da diese mit einer einzelnen Eintragung (commit) erfolgen mu횩. Bei Verwendung der '-a' Option sind keine weiteren Pfadangaben erlaubt (Ausnahme bei gleichzeitiger Verwendung der '-i' Option)."
+#. type: Title -
+#: en/git-commit.txt:464
+#, fuzzy, no-wrap, priority:280
+#| msgid "DATE FORMATS"
+msgid "COMMIT INFORMATION"
+msgstr "DATUMSFORMATE"
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, fuzzy, priority:280
+#| msgid "Various Git commands use the following environment variables:"
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr "Verschiedene Git-Befehle benutzen die folgenden Umgebungsvariablen:"
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
+#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
#, fuzzy, priority:280
#| msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. Tools that turn commits into email, for example, use the first line on the Subject: line and the rest of the commit in the body."
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr "Obwohl es technisch nicht erforderlich ist, ist es eine gebr채uchlich die Eintragungsbemerkung (commit message) mit einer einzelnen kurzen Zusammenfassung (weniger als 50 Zeichen) zu beginnen, gefolgt von einer Leerzeile und weiterf체hrender Information. So k철nnen zB Werkzeuge die Eintragungen in emails verpacken die erste Zeile als Betreff und den Rest als Mailinhalt verwenden."
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr "ENVIRONMENT AND CONFIGURATION VARIABLES"
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, fuzzy, priority:280
#| msgid "The editor used to edit the commit log message will be chosen from the GIT_EDITOR environment variable, the core.editor configuration variable, the VISUAL environment variable, or the EDITOR environment variable (in that order)."
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr "Der Editor zum Bearbeiten der Eintragungsbemerkung wird durch die GIT_EDITOR Umgebungsvariable, die core.editor Konfigurationsvariable die VISUAL Umgebungsvariable oder die EDITOR Umgebungsvariable festgelegt (in dieser Reihenfolge)."
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, fuzzy, priority:280
#| msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, and `post-commit` hooks. See linkgit:githooks[5] for more information."
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr "Dieser Befehl kann die folgenden Einsprungspunkte (hooks) aufrufen: `commit-msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe linkgit:githooks[5] f체r weitere Information."
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15149,18 +15163,18 @@ msgstr "git-config - Repositoryeigene oder globale Optionen auslesen und setzen"
#| "'git config' [<file-option>] --get-color name [default]\n"
#| "'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15279,9 +15293,7 @@ msgstr "--replace-all"
#: en/git-config.txt:77
#, priority:100
msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex)."
-msgstr ""
-"Das Standardverhalten ist, h철chstens eine Zeile zu ersetzen. Dies ersetzt "
-"alle Zeilen, die dem Schl체ssel entsprechen (und eventuell der Wert_Regex)."
+msgstr "Das Standardverhalten ist, h철chstens eine Zeile zu ersetzen. Dies ersetzt alle Zeilen, die dem Schl체ssel entsprechen (und eventuell der Wert_Regex)."
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:45
@@ -15366,7 +15378,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr "Um Optionen zu lesen: Es wird nur aus der globalen Datei ~/.gitconfig gelesen, anstelle aller verf체gbaren Dateien."
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr "Siehe auch <<FILES>>."
@@ -15633,212 +15645,224 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr "--get-colorbool Name [Standardausgabe-ist-tty]"
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr "Finde die Farbeinstellung f체r `Name` (Beispielsweise `color.diff`) und gib \"true\" oder \"false\" aus. `Standardausgabe-ist-tty` sollte entweder \"true\" oder \"false\" sein und wird in Betracht gezogen, wenn in der Konfigurationsdatei \"auto\" steht. Falls `Standardausgabe-ist-tty` fehlt, dann wird die Standardausgabe des Programmes selbst 체berpr체ft und gibt Status 0 zur체ck, falls Farbe verwendet wird, andernfalls wird Status 1 zur체ckgegeben. Wenn die Farbeinstellung f체r `Name` undefiniert ist, verwendet der Befehl `color.ui` als Fallback."
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, fuzzy, no-wrap, priority:100
#| msgid "--get-color name default"
msgid "--get-color name [default]"
msgstr "--get-color Name Standard"
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr "Find die Farbe die f체r `Name` konfiguriert wurde (Beispielsweise `color.diff.new`) und gib sie als ANSI Farb-Escapesequenz auf der Standardausgabe aus. Der optionale Parameter `Standard` wird verwendet, wenn keine Farbe f체r `Name` konfiguriert wurde."
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, fuzzy, priority:100
#| msgid "If not set explicitly with '--file', there are three files where 'git-config' will search for configuration options:"
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr "Wenn nicht explizit mit '--file' ver채ndert, gibt es drei Dateien, in welchen 'git-config' nach Optionen sucht:"
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr "${prefix}/etc/gitconfig"
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr "Systemweite Konfigurationsdatei."
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr "~/.gitconfig"
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr "Benutzerspezifische Konfigurationsdatei. Auch \"globale\" Konfigurationsdatei genannt."
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr "$GIT_DIR/config"
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, fuzzy, priority:100
#| msgid "System-wide configuration file."
msgid "Repository specific configuration file."
msgstr "Systemweite Konfigurationsdatei."
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, fuzzy, no-wrap, priority:100
#| msgid "$GIT_DIR/config"
msgid "$GIT_DIR/config.worktree"
msgstr "$GIT_DIR/config"
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, fuzzy, priority:100
#| msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git-config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr "Falls keine weiteren Optionen gegeben werden, werden alle Leseoperationen auf allen verf체gbaren Dateien ausgef체hrt. Wenn die globale oder die systemweite Konfigurationsdatei fehlen, werden sie ignoriert. Falls die repositoryeigene Konfigurationsdatei nicht verf체gbar oder lesbar ist wird 'git-config' mit einem Fehlercode, der nicht null ist, beenden. In beiden F채llen jedoch wird keine Fehlermeldung ausgegeben."
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, fuzzy, priority:100
#| msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like '--replace-all' and '--unset'. *'git-config' will only ever change one file at a time*."
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr "Alle Schreiboperationen werden standardm채ssig auf die repositoryspezifische Konfigurationsdatei ausgef체hrt. Beachten Sie, dass dies auch Optionen wie '--replace-all' und '--unset' betrifft. *'git-config' ver채ndert nur eine Datei in einem Aufruf*."
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, fuzzy, priority:100
#| msgid "You can override these rules either by command line options or by environment variables. The '--global' and the '--system' options will limit the file used to the global or system-wide file respectively. The GIT_CONFIG environment variable has a similar effect, but you can specify any filename you want."
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr "Sie k철nnen diese Regeln entweder mit Optionen auf der Kommandozeile oder durch Umgebungsvariablen 체berschreiben. Die Optionen '--global' und die '--system' beschr채nken die Datei auf die globale, respektive die systemweite Konfigurationsdatei. Die Umgebungsvariable GIT_CONFIG hat einen 채hnlichen Effekt, aber Sie k철nnen jeden Dateinamen den Sie wollen, angeben."
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr "ENVIRONMENT"
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr "Beziehe die Konfiguration aus der gegebenen Datei anstelle von .git/config. Verwenden der Option \"--global\" erzwingt dies zu ~/.gitconfig. Das Verwenden der Option \"--system\" erzwingt dies zu ${prefix}/etc/gitconfig."
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, fuzzy, priority:100
#| msgid "For reading options: read only from system-wide $(prefix)/etc/gitconfig rather than from all available files."
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr "Um Optionen zu lesen: Es wird nur aus der systemweiten Datei ${prefix}/etc/gitconfig gelesen, anstelle aller verf체gbaren Dateien."
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr "Es ist eine folgende .git/config-Datei gegeben:"
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t#\n"
@@ -15860,7 +15884,7 @@ msgstr ""
"\t#\n"
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15874,7 +15898,7 @@ msgstr ""
"\tfilemode = false\n"
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t; Our diff algorithm\n"
@@ -15893,7 +15917,7 @@ msgstr ""
"\t\trenames = true\n"
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t; Proxy settings\n"
@@ -15912,7 +15936,7 @@ msgstr ""
"\t\tgitproxy=default-proxy ; f체r den Rest\n"
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15924,159 +15948,159 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr "Sie k철nnen den Dateimodus auf \"true\" setzen mit"
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr "% git config core.filemode true\n"
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr "Die hypothetischen Proxybefehlseintr채ge haben ein Anh채ngel, um unterscheiden zu k철nnen, auf welche URL sie sich beziehen. Hier folgt, wie Sie den Eintrag f체r kernel.org zu \"ssh\" 채ndern."
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr "Dies stellt sicher, dass nur das Schl체ssel/Wertpaar f체r kernel.org ersetzt wird."
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr "Um den Eintrag f체r Umbenennungen zu l철schen, verwenden Sie"
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr "% git config --unset diff.renames\n"
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr "Falls Sie einen Eintrag f체r eine Multivar (Eine Variable mit mehreren Eintr채gen), l철schen m철chten, m체ssen Sie eine Regex f체r den Wert exakt einer Zeile angeben."
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr "Um den Wert f체r einen gegebenen Schl체ssel abzufragen, benutzen Sie"
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr "% git config --get core.filemode\n"
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr "oder"
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr "% git config core.filemode\n"
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr "oder, um eine Multivar abzufragen:"
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr "% git config --get core.gitproxy \"for kernel.org$\"\n"
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr "Falls Sie alle Werte einer Multivar wissen m철chten, verwenden Sie:"
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr "% git config --get-all core.gitproxy\n"
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, fuzzy, priority:100
#| msgid "If you like to live dangerous, you can replace *all* core.gitproxy by a new one with"
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr "Wenn Sie gerne gef채hrlich leben, k철nnen Sie *alle* core.gitproxy-Eintr채ge mit einem neuen ersetzen durch"
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr "% git config --replace-all core.gitproxy ssh\n"
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr "Wenn Sie jedoch wirklich nur eine Zeile f체r den Standardproxy ver채ndern m철chten, beispielsweise diejenige ohne ein Anh채ngsel \"for ...\", k철nnen Sie dies so tun:"
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr "% git config core.gitproxy ssh '! for '\n"
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr "Um wirklich die Werte mit einem Ausrufezeichen auszulesen, m체ssen Sie"
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr "% git config section.key value '[!]'\n"
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr "Um einen neuen Proxy hinzuzuf체gen, ohne einen der anderen der bereits vorhandenen zu ver채ndern, benutzen Sie"
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, fuzzy, no-wrap, priority:100
#| msgid "% git config core.gitproxy '\"proxy-command\" for example.com'\n"
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr "% git config core.gitproxy '\"proxy-command\" for example.com'\n"
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr "Ein Beispiel, um angepasste Farbe der Konfigurationsdatei in Ihrem Script zu verwenden:"
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -16090,13 +16114,13 @@ msgstr ""
"echo \"${WS}Ihre Whitespace-Farbe oder invertiertes Blau${RESET}\"\n"
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16109,19 +16133,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16129,13 +16153,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16222,7 +16246,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19581,7 +19605,7 @@ msgid "The id of a tree object."
msgstr "SHA1 eines git-Markierungobjektes."
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr "<path>..."
@@ -22898,7 +22922,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -23292,7 +23316,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -24063,7 +24087,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24690,7 +24714,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr "HEAD"
@@ -26471,7 +26495,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr "Umgebungsvariablen"
@@ -26844,7 +26868,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26920,505 +26944,505 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr "--max-depth <Tiefe>"
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr "Schalte die Hervorhebung von 횥bereinstimmungen aus, auch wenn dies per Konfigurationsdatei eingeschaltet wurde. Identisch zu `--color=never`."
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr "-<Anz>"
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr "-C <Anz>"
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr "--context <Anz>"
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr "-A <Anz>"
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr "--after-context <Anz>"
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr "-B <Anz>"
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr "--before-context <Anz>"
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr "--threads <Anz>"
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr "-f <Datei>"
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
@@ -27428,73 +27452,91 @@ msgstr ""
"<Datei>..."
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, fuzzy, priority:100
#| msgid "Adds content from all `\\*.txt` files under `Documentation` directory and its subdirectories:"
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr "F체ge die Inhalte aller `\\*.txt` Dateien unter dem `Documentation` Verzeichnis und seinen Unterverzeichnissen hinzu:"
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, fuzzy, no-wrap, priority:100
#| msgid "`git rm Documentation/\\*.txt`"
msgid "`git grep solution -- :^Documentation`"
msgstr "git rm Documentation/\\*.txt"
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27532,7 +27574,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr "COMMANDS"
@@ -31108,7 +31150,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr "Sonstiges"
@@ -31174,7 +31216,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr "<Datei>"
@@ -31299,98 +31341,98 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, fuzzy, no-wrap, priority:100
#| msgid "-u <upload-pack>"
msgid "--upload-pack=<exec>"
msgstr "-u <upload-pack>"
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -31411,7 +31453,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31922,7 +31964,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33826,7 +33868,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36728,13 +36770,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38882,7 +38924,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38912,493 +38954,560 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, fuzzy, priority:100
#| msgid "This option bypasses the pre-commit and commit-msg hooks. See also linkgit:githooks[5]."
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr "Diese Option schaltet die pre-commit und commit-msg Einsprungspunkte (hooks) aus. Siehe auch linkgit:githooks[5]."
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, fuzzy, no-wrap, priority:100
#| msgid "-c <commit>"
msgid "--exec <cmd>"
msgstr "-c <commit>"
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, fuzzy, no-wrap, priority:100
#| msgid "OPTIONS"
msgid "INCOMPATIBLE OPTIONS"
msgstr "OPTIONS"
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, fuzzy, priority:100
#| msgid "--preserve-merges"
msgid "--preserve-merges and --interactive"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, fuzzy, priority:100
#| msgid "--preserve-merges"
msgid "--preserve-merges and --signoff"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, fuzzy, priority:100
#| msgid "--preserve-merges"
msgid "--preserve-merges and --rebase-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -39406,27 +39515,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -39434,156 +39545,341 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, fuzzy, priority:100
#| msgid "-C <commit>"
msgid "commit"
msgstr "-C <commit>"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, fuzzy, priority:100
#| msgid "-C <commit>"
msgid "commit it"
msgstr "-C <commit>"
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39592,74 +39888,74 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, fuzzy, no-wrap, priority:100
#| msgid "$ git log -g -2 HEAD\n"
msgid "$ git rebase -i HEAD~5\n"
msgstr "$ git log -g -2 HEAD\n"
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39670,26 +39966,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, fuzzy, no-wrap, priority:100
#| msgid "$ git log -g -2 HEAD\n"
msgid "$ git rebase -i -r --onto Q O\n"
msgstr "$ git log -g -2 HEAD\n"
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39702,31 +39998,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39740,85 +40036,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39829,13 +40125,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39846,13 +40142,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39863,73 +40159,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39940,19 +40236,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39962,67 +40258,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -40036,25 +40332,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -40065,7 +40361,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -40075,7 +40371,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40084,55 +40380,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -40143,13 +40439,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -40157,7 +40453,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40169,7 +40465,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40178,37 +40474,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42823,7 +43119,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -44589,239 +44885,231 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>..."
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <Datei>..."
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, fuzzy, priority:280
#| msgid "Remove files from the index, or from the working tree and the index. 'git-rm' will not remove a file from just your working directory. (There is no option to remove a file only from the work tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When '--cached' is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr "Entferne Dateien aus dem Index, oder aus dem Arbeitsbereich und dem Index. 'git-rm' wird die Datei immer auch aus dem Index entfernen - es gibt keine M철glichkeit die Datei lediglich aus dem Arbeitsbereich zu l철schen (zu diesem Zweck kann das normale '/bin/rm' verwendet werden). Die zu entfernende Datei mu횩 identisch mit der letzten Version im Projektarchiv sein, und es k철nnen gleichzeitig keine 횆nderungen im Index bereitgestellt werden (staging). Dieses Standardverhalten kann jedoch mit der '-f' Option 체bersteuert werden. Wird '--cached' angegeben, so mu횩 der bereitgestellte Inhalt entweder der letzten Version im Projektarchiv entsprechen oder der Datei im Arbeitsbereich. Die Datei wird bei Verwendung von '--cached' ausschlie횩lich aus dem Index entfernt."
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
-msgstr ""
-"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
-"<file>...\n"
-"#-#-#-#-# git-rm-de.po (PACKAGE VERSION) #-#-#-#-#\n"
-"<Datei>..."
-
#. type: Plain text
-#: en/git-rm.txt:38
+#: en/git-rm.txt:36
#, fuzzy, priority:280
#| msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr "Dateien die entfernt werden sollen. Dateisuchkriterien (z.B. '*.c') k철nnen verwendet werden um alle\tpassenden Dateien zu entfernen. Soll sich git selbst um die Erweiterung der Dateisuchkriterien k체mmern, so mu횩 dies dem Befehlsprozessor angegeben werden (z.B. Documentation/\\\\*.txt). Es kann auch ein Pfadname angegeben werden, um rekursiv alle in diesem Pfad befindlichen Dateien (auch in den Unterordnern) zu entfernen (z.B. 'dir' f체r 'dir/datei1' und 'dir/datei2'). Allerdings mu횩 dazu die '-r' Option explizit angegeben werden."
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:38
+#, priority:280
+msgid "The command removes only the paths that are known to Git."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:43
+#, fuzzy, priority:280
+#| msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm \\'d\\*\\'` and `git rm \\'d/\\*\\'`, as the former will also remove all of directory `d2`."
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr "Dateisuchkrierien k철nnen verzeichnis체bergreifend verwendet werden. Nehmen wir zwei Verzeichnisse 'd' und 'd2' an, so besteht ein Unterschied in der Verwendung von `git rm \\'d\\*\\'` und `git rm \\'d/\\*\\'`, da der erstere Befehl auch alles aus dem Verzeichnis 'd2' entfernen wird."
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr "Ignoriere das Ergebnis der Pr체fung auf Aktualit채t der Dateien."
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr "Entferne die Datei(en) nicht wirklich, sondern zeige nur ob sie im Index existieren und gegebenenfalls durch den Befehl entfernt werden w체rden."
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr "Erm철gliche rekursives Entfernen wenn ein f체hrender Verzeichnisname angegeben wurde."
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr "Diese Option kann verwendet werden um Dateien ausschlie횩lich aus dem Index zu entfernen. Dateien im Arbeitsbereich bleiben unber체hrt, unabh채ngig davon ob sie ver채ndert wurden oder nicht."
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr "Der Befehl wird mit einem Fehlerwert von 0 beendet, selbst wenn keine Dateien verarbeitet wurden."
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, fuzzy, priority:280
#| msgid "'git-rm' normally outputs one line (in the form of an \"rm\" command) for each file removed. This option suppresses that output."
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr "'git-rm' gibt normalerweise f체r jeden entfernte Datei eine Zeile (in Form eines \"rm\" Befehls) aus. Mit dieser Option wird diese Ausgabe unterdr체ckt."
-#. type: Plain text
-#: en/git-rm.txt:79
-#, fuzzy, priority:280
-#| msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to git. Giving the name of a file that you have not told git about does not remove that file."
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr "Die <Datei> Liste die an den Befehl 체bergeben wird, kann genaue Dateinamen, Dateisuchkriterien oder f체hrende Verzeichnisnamen beinhalten. 'git-rm' wird allerdings nur jene Dateien entfernen, von deren Existenz git wei횩. Wird eine Datei angegeben die von git noch nicht verwaltet wird, so wird sie nicht entfernt."
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, fuzzy, priority:280
-#| msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm \\'d\\*\\'` and `git rm \\'d/\\*\\'`, as the former will also remove all of directory `d2`."
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr "Dateisuchkrierien k철nnen verzeichnis체bergreifend verwendet werden. Nehmen wir zwei Verzeichnisse 'd' und 'd2' an, so besteht ein Unterschied in der Verwendung von `git rm \\'d\\*\\'` und `git rm \\'d/\\*\\'`, da der erstere Befehl auch alles aus dem Verzeichnis 'd2' entfernen wird."
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, fuzzy, no-wrap, priority:280
#| msgid "$ git commit -a\n"
msgid "Using ``git commit -a''"
msgstr "$ git commit -a\n"
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, fuzzy, priority:280
#| msgid "Show changes between two trees, a tree and the working tree, a tree and the index file, or the index file and the working tree."
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr "Zeige Unterschiede zwischen zwischen zwei B채umen, einen Baum und dem Arbeitsbereich, einem Baum und dem Index, oder dem Index und dem Arbeitsbereich."
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr "$ git add -A\n"
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, fuzzy, priority:280
#| msgid "linkgit:git-add[1]"
msgid "See linkgit:git-add[1]."
msgstr "linkgit:git-add[1]"
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr "git rm Documentation/\\*.txt"
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, fuzzy, priority:280
#| msgid "Removes all `\\*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr "Entfernt alle `\\*.txt` Dateien aus dem Index die im `Documentation` Verzeichnis oder dessen Unterverzeichnissen liegen."
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, fuzzy, priority:280
#| msgid "Note that the asterisk `\\*` is quoted from the shell in this example; this lets git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr "Anmerkung: das Sternchen `\\*` wird in diesem Beispiel vom Befehlsprozessor (shell) nicht automatisch erweitert, wodurch der 'git-rm' Befehl auch Unterverzeichnisse des `Documentation/` Verzeichnisses erfassen kann."
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, fuzzy, no-wrap, priority:280
#| msgid "git rm -f git-*.sh"
msgid "`git rm -f git-*.sh`"
msgstr "git rm -f git-*.sh"
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr "Dieses Beispiel l채횩t dem Befehlsprozessor (shell) die Erweiterung des Sternchens durchf체hren (git erh채lt bereits eine explizite Dateiliste 체bergeben), und so wird zB `subdir/git-foo.sh` nicht entfernt werden."
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -47362,7 +47650,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr "git-stash - 횆nderungen in einem Arbeitsverzeichnis aufbewahren"
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -47372,6 +47660,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -47379,97 +47668,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
+#: en/git-stash.txt:62
#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
-#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -47477,140 +47736,237 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr "Der Befehl akzeptiert dieselben Optionen wie 'git log' um die Ausgabe zu steuern. Siehe linkgit:git-log[1]."
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, fuzzy, no-wrap, priority:240
#| msgid "'git log' <option>..."
msgid "show [<options>] [<stash>]"
msgstr "'git log' <option>..."
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, fuzzy, no-wrap, priority:240
+#| msgid "<start-point>"
+msgid "<stash>"
+msgstr "<start-point>"
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -47619,31 +47975,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -47655,13 +48011,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47676,13 +48032,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47694,19 +48050,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47721,19 +48077,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47742,7 +48098,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48736,7 +49092,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48915,7 +49271,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -49192,19 +49548,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51849,7 +52211,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
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-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr "<Commit>"
@@ -52294,329 +52656,326 @@ msgstr "--git-dir=<Pfad>"
#. type: Plain text
#: en/git.txt:116
-#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+#, fuzzy, priority:100
+#| msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
msgstr "Setzt den Pfad zum Repository. Dies kann auch 체ber die Umgebungsvariable `GIT_DIR` gesteuert werden. Es kann ein absoluter Pfad oder ein Pfad relativ zum momentanen Arbeitsverzeichnis angegeben werden."
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr "--work-tree=<Pfad>"
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr "--namespace=<Pfad>"
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr "Setzt den Git Namespace. Siehe linkgit:gitnamespaces[7] f체r weitere Details. Dies entspricht dem Setzen der Umgebungsvariable `GIT_NAMESPACE`."
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr "--super-prefix=<Pfad>"
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr "Das Repository als Bare-Repository behandeln. Wenn die Umgebungsvariable GIT_DIR nicht gestezt ist, wird sie auf das aktuelle Arbeitsverzeichnis gesetzt."
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr "Pfadspezifikationen buchst채blich (d.h. kein Globbing, keine Pfadspezifikationsangaben) behandeln. Dies entspricht dem Setzen der Umgebungsvariable `GIT_LITERAL_PATHSPECS` auf `1`."
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
-msgstr ""
-"F체gt die Pfadspezifikationsangabe \"glob\" zu allen Pfadspezifikationen "
-"hinzu. Dies entspricht dem Setzen der Umgebungsvariable `GIT_GLOB_PATHSPECS` "
-"auf 1. Globbing kann f체r einzelne Pfadspezifikationen mit der "
-"Pfadspezifikationsangabe \":(literal)\" deaktiviert werden"
+msgstr "F체gt die Pfadspezifikationsangabe \"glob\" zu allen Pfadspezifikationen hinzu. Dies entspricht dem Setzen der Umgebungsvariable `GIT_GLOB_PATHSPECS` auf 1. Globbing kann f체r einzelne Pfadspezifikationen mit der Pfadspezifikationsangabe \":(literal)\" deaktiviert werden"
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
-msgstr ""
-"F체gt die Pfadspezifikationsangabe \"literal\" zu allen Pfadspezifikationen "
-"hinzu. Dies entspricht dem Setzen der Umgebungsvariable "
-"`GIT_NOGLOB_PATHSPECS` auf 1. Globbing kann f체r einzelne Pfadspezifikationen "
-"mit der Pfadspezifikationsangabe \":(glob)\" aktiviert werden"
+msgstr "F체gt die Pfadspezifikationsangabe \"literal\" zu allen Pfadspezifikationen hinzu. Dies entspricht dem Setzen der Umgebungsvariable `GIT_NOGLOB_PATHSPECS` auf 1. Globbing kann f체r einzelne Pfadspezifikationen mit der Pfadspezifikationsangabe \":(glob)\" aktiviert werden"
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr "F체gt die Pfadspezifikationsangabe \"icase\" zu allen Pfadspezifikationen hinzu. Dies entspricht dem Setzen der Umgebungsvariable `GIT_ICASE_PATHSPECS` auf 1."
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr "F체hrt keine optionalen Operationen durch, die Sperren erfordern. Dies entspricht dem Setzen von `GIT_OPTIONAL_LOCKS` auf `0`."
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr "--list-cmds=Gruppe[,Gruppe...]"
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
-msgstr ""
-"Befehle nach Gruppe auflisten. Dies ist eine interne/experimentelle Option "
-"und k철nnte in zukunft ge채ndert oder entfernt werden. Unterst체tzt folgende "
-"Gruppen: builtins (Integrierte Befehle), parseopt (Integrierte Befehle, die "
-"Parse-Optionen verwenden), main (Alle Befehle im Verzeichnis libexec), "
-"others (Alle anderen Befehle in `$PATH` mit Pr채fix git-), list-<Kategorie> ("
-"siehe Kategorien in command-list.txt), nohelpers (Hilfsbefehle ausschlie횩en)"
-", alias and config (Befehlsliste aus Konfigurationsvariable "
-"completion.commands)"
+msgstr "Befehle nach Gruppe auflisten. Dies ist eine interne/experimentelle Option und k철nnte in zukunft ge채ndert oder entfernt werden. Unterst체tzt folgende Gruppen: builtins (Integrierte Befehle), parseopt (Integrierte Befehle, die Parse-Optionen verwenden), main (Alle Befehle im Verzeichnis libexec), others (Alle anderen Befehle in `$PATH` mit Pr채fix git-), list-<Kategorie> (siehe Kategorien in command-list.txt), nohelpers (Hilfsbefehle ausschlie횩en), alias and config (Befehlsliste aus Konfigurationsvariable completion.commands)"
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr "GIT-BEFEHLE"
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr "Wir unterteilen Git in hochrangige Befehle (\"Porcelain\") und Systembefehle (\"Plumbing\")."
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr "Hochrangige Befehle (Porcelain)"
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr "Wir unterteilen \"Porcelain\"-Befehle in Hauptbefehle und zus채tzliche Benutzerwerkzeuge."
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr "Hauptbefehle"
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr "Nebenbefehle"
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr "Manipulatoren:"
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr "Abfragen:"
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr "Mit anderen interagieren"
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr "Diese Befehle dienen zum Interagieren mit fremden Versionsverwalungen oder mit anderen Personen 체ber Patch per E-Mail."
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr "Systembefehle (\"Plumbing\")"
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr "Auch wenn Git eigene hochrangige Befehle enth채lt, reichen die Systembefehle aus, um alternative hochrangige Befehle zu entwickeln. Entwickler solcher Befehle sollten sich zum Einstieg in linkgit:git-update-index[1] und linkgit:git-read-tree[1] einlesen."
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr "Die Schnittstelle (Eingaben, Ausgaben, verf체gbare Optionen und Semantik) zu diesen Systembefehlen sollen viel stabiler als \"Porcelain\"-Befehle sein, da sie haupts채chlich zum Gebrauch in Skripten vorgesehen sind. Bei der Schnittstelle zu \"Porcelain\"-Befehlen sind dagegen 횆nderungen zur Verbesserung der Benutzerfreundlichkeit vorbehalten."
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr "Im folgenden Text werden die Systembefehle unterteilt in Befehle um Objekte (in the repository, index, and working tree) zu manipulieren, Befehle um Objekte abzufragen und zu vergleichen und Befehle um Objekte und Referenzen zwischen Repositories zu 체bertragen."
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr "Manipulierende Befehle"
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr "Abfragebefehle"
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr "Abfragebefehle ver채ndern im Allgemeinen keine Dateien im Arbeitsverzeichnis."
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, fuzzy, no-wrap, priority:100
#| msgid "Synching repositories"
msgid "Syncing repositories"
msgstr "Repositories synchronisieren"
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr "Die folgenden Befehle sind Hilfsbefehle f체r die oben genannten Befehle; Endbenutzer rufen sie normalerweise nicht direkt auf."
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr "Interne Hilfsbefehle"
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr "Diese Befehle sind Hilfsbefehle f체r die andere Befehle; Endbenutzer rufen sie normalerweise nicht direkt auf."
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr "Konfigurationsmechanismus"
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr "Git nutzt ein einfaches Textformat um Einstellungen pro Benutzer und Repository zu speichern. So eine Konfigurationsdatei kann wie folgt aussehen:"
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -52628,7 +52987,7 @@ msgstr ""
"#\n"
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -52642,620 +53001,650 @@ msgstr ""
"\temail = \"gitster@pobox.com\"\n"
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr "Verschiedene Git-Befehle lesen die Konfigurationsdatei und passen ihr Verhalten entsprechend an. Siehe linkgit:git-config[1] f체r eine Liste der Optionen und mehr Details 체ber den Konfigurationsmechanismus."
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr "Bezeichner-Terminologie"
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr "Bezeichnet den Namen eines Objekts beliebigen Typs."
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr "<Blob>"
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr "Bezeichnet den Namen eines Blob-Objekts."
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr "Bezeichnet den Namen eines Tree-Objekts."
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr "Bezeichnet den Namen eines Commit-Objekts."
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr "Bezeichnet den Namen eines Tree-, Commit- oder Markierungs-Objekts. Ein Befehl, der eine <Commit-Referenz> als Argument akzeptiert arbeitet letztendlich mit einem <Tree>-Objekt, dereferenziert aber auch automatisch <Commit>- und <Markierung>-Objekte, die auf einen <Tree> verweisen."
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr "<Commit-Angabe>"
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr "Bezeichnet den Namen eines Commit- oder Markierungs-Objekts. Ein Befehl, der eine <Commit-Angabe> als Argument akzeptiert arbeitet letztendlich mit einem <Commit>-Objekt, dereferenziert aber auch automatisch <Markierung>-Objekte, die auf einen <Commit> verweisen."
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr "Gibt an, dass eine Objekt-Art ben철tigt wird. Momentan sind m철glich: `blob`, `tree`, `commit` oder `tag` (Markierung)."
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr "Bezeichnet einen Dateinamen, der fast immer relativ zur Verzeichnisstruktur in `GIT_INDEX_FILE` ist."
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr "Symbolische Bezeichner"
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr "Jeder Git-Befehl der ein beliebiges <Objekt> akzeptiert kann auch die folgende symbolische Notation verwenden:"
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr "Bezeichnet die Spitze des aktuellen Entwicklungszweigs."
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr "<Markierung>"
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
-msgstr ""
-"Eine g체ltige Markierungsbezeichnung (d.h. ein `refs/tags/<Markierung>` "
-"Verweis)."
+msgstr "Eine g체ltige Markierungsbezeichnung (d.h. ein `refs/tags/<Markierung>` Verweis)."
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr "Eine g체ltige Branch-Bezeichnung (d.h. ein `refs/heads/<Branch>` Verweis)."
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr "F체r eine umf채nglichere Auflistung wie Objektbezeichnungen angegeben werden k철nnen siehe den Abschnitt \"REVISIONEN ANGEBEN\" in linkgit:gitrevisions[7]."
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr "Datei-/Verzeichnisstruktur"
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr "Siehe das Dokument linkgit:gitrepository-layout[5]."
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr "Lesen Sie linkgit:githooks[5] f체r mehr Details 체ber die einzelnen Hooks."
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr "횥bergeordnete SCMs k철nnen zus채tzliche Informationen im `$GIT_DIR` bereitstellen und verwalten."
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr "Terminologie"
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr "Siehe linkgit:gitglossary[7]."
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr "Verschiedene Git-Befehle benutzen die folgenden Umgebungsvariablen:"
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr "Das Git-Repository"
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr "Diese Umgebungsvariable erlaubt es eine alternative Indexdatei anzugeben. Andernfalls wird die Standarddatei `$GIT_DIR/index` verwendet."
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr "Mit dieser Umgebungsvariable kann die Indexversion f체r neue Repositories. Dies hat keine Auswirkung auf bestehende Indexdateien. Standardm채횩ig wird Indexversion 2 oder 3 verwendet. Siehe linkgit:git-update-index[1] f체r weitere Informationen."
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr "Wenn das Objektverzeichnis 체ber diese Umgebungsvariable angegeben wird werden die SHA1-Verzeichnisse darunter angelegt, ansonsten wird standardm채횩ig Das Verzeichnis`$GIT_DIR/objects` verwendet."
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr "Durch die unver채nderliche Natur von Git-Objekten k철nnen alte Objekte in gemeinsame schreibgesch체tzte Verzeichnisse archiviert werden. Diese Variable gibt eine mit \":\" (\";\" unter Windows) getrennte Liste von Objektverzeichnissen, in denen nach Git-Objekten gesucht werden kann, an. Neue Objekte werden nicht in diese Verzeichnisse geschrieben."
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr "Eintr채ge, die mit `\"` (doppelten Anf체hrungszeichen) beginnen werden wie Zeichenketten in C interpretiert, d.h. f체hrende und abschlie횩ende doppelte Anf체hrungszeichen werden entfernt und R체ckw채rtsschr채gstrich-basierte Escape-Sequenzen werden respektiert. D.h. der Wert `\"Pfad-mit-\\\"-und-:-im-Pfad\":Standard-Pfad` enth채lt zwei Pfade: `\"Pfad-mit-\"-und-:-im-Pfad` und `Standard-Pfad`."
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr "Wenn die Umgebungsvariable `GIT_DIR` gesetzt ist, gibt sie den Pfad an, der statt `.git` als Basis des Repositories verwendet wird. Die Befehlszeilenoption `--git-dir` setzt diesen Wert auch."
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr "Setzt den Git Namespace; Siehe linkgit:gitnamespaces[7] f체r Details. Die Befehlszeilenoption `--namespace` setzt diesen Wert auch."
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
-# noqa
#. type: Plain text
-#: en/git.txt:481
+# noqa
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr "Wenn diese Variable einen Pfad enth채lt, werden nicht-Arbeitsverzeichnis-Dateien, die sich normalerweise in $GIT_DIR befinden stattdessen aus diesem Verzeichnis geladen. Arbeitsverzeichnis-spezifische Dateien wie HEAD oder index werden aus $GIT_DIR geladen. Siehe linkgit:gitrepository-layout[5] und linkgit:git-worktree[1] f체r Details. Andere Pfadvariablen wie GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY, etc. haben Vorrang gegen체ber dieser Variable."
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr "Git-Commits"
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
-msgstr "'EMAIL'"
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "Siehe linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr "Git-Diffs"
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr "Die einziegen g체ltigen Werte sind \"--unified=??\" oder \"-u??\" um die Anzahl der angezeigten Kontextzeilen zu steuern, wenn ein vereinheitlichtes Diff erstellt wird. Dies hat Vorrang vor jeglichen auf der Kommandozeile an git diff 체bergebenen Werten der Optionen \"-U\" oder \"--unified\"."
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr "Wenn die Umgebungsvariable `GIT_EXTERNAL_DIFF` gesetzt ist, wird das darin angegebene Programm statt dem oben beschrieben Diff-Befehl aufgerufen. F체r einen hinzuf체gten, entfernten oder modifizierten Pfad wird `GIT_EXTERNAL_DIFF` mit 7 Parametern aufgerufen:"
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr "Pfad alte-Datei alter-Hash alte-Rechte neue-Datei neuer-Hash neue-Rechte"
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr "wobei:"
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr "<alte|neue>-Datei"
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr "Dateien sind, die GIT_EXTERNAL_DIFF benutzen kann um"
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr "den <alten|neuen> Inhalt auszulesen,\n"
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr "<alter|neuer>-Hash"
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr "die 40-stelligen hexadezimalen Hashes sind,"
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr "<alte|neue>-Rechte"
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr "die oktale Representation der Datei-Rechte sind."
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr "Die Dateiparameter k철nnen auf die Arbeitsdatei des Benutzers (z.B. `neue-Datei` in \"git-diff-files\"), `/dev/null` (z.B. `alte-Datei` wenn eine neue Datei hinzugef체gt wird) oder eine tempor채re Datei (z.B. `alte-Datei` im Index) verweisen. `GIT_EXTERNAL_DIFF` muss sich nicht damit befassen die tempor채re Datei zu l철schen. --- sie wird entfernt sobald `GIT_EXTERNAL_DIFF` beendet wird."
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr "F체r einen nicht zusammengef체hrten Pfad wird `GIT_EXTERNAL_DIFF` mit einem Parameter, <Pfad>, aufgerufen."
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr "F체r jeden Pfad mit dem `GIT_EXTERNAL_DIFF` aufgerufen wird, werden die beiden Umgebungsvariablen `GIT_DIFF_PATH_COUNTER` und `GIT_DIFF_PATH_TOTAL` gesetzt."
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr "Ein 1-basierter Z채hler, der f체r jeden Pfad um eins inkrementiert wird."
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr "Die Gesamtanzahl Pfade."
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr "Eine numerische Angabe, die Ausgabemenge der rekursiven Merge-Strategie steuert. 횥berschreibt merge.verbosity. Siehe linkgit:git-merge[1]"
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr "Diese Umgebungsvariable 체berschreibt `$PAGER`. Wenn sie auf eine leere Zeichenkette oder \"cat\" gesetzt ist, startet Git keinen Pager. Siehe auch die Option `core.pager` in linkgit:git-config[1]."
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr "Diese Umgebungsvariable 체berschreibt `$EDITOR` und `$VISUAL`. Sie wird von mehreren Git-Befehlen verwendet, um im interaktiven Modus einen Editor zu 철ffnen. Siehe auch linkgit:git-var[1] und die Option `core.editor` in linkgit:git-config[1]."
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr "Wenn eine dieser Umgebungsvariablen gesetzt ist, verwenden 'git fetch' und 'git push' den angegebenen Befehl statt 'ssh' zum Verbinden mit entfernten Systemen. Die Kommandozeilenparameter die dem konfigurierten Befehl 체bergeben werden, richten sich nach der SSH-Varinate. Siehe die Option `ssh.variant` in linkgit:git-config[1] f체r Details."
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr "`$GIT_SSH_COMMAND` hat Vorrang 체ber `$GIT_SSH` und wird von der Shell interpretiert, daher k철nnen zus채tzliche Argumente mit angegeben werden. `GIT_SSH` dagegen darf nur den Pfad zu einem Programm enthalten (dieses kann ein Wrapper-Shell-Script sein, falls zus채tzliche Argumente ben철tigt werden)."
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr "Meistens ist es einfacher die gew체nschten Optionen 체ber Ihre pers철nliche `.shh/config`-Datei zu konfigurieren. Bitte konsultieren Sie Ihre SSH-Dokumentation f체r weitere Details."
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
-msgstr ""
-"Wenn diese Umgebungsvariable gesetzt ist, 체berschreibt sie Git's "
-"automatische Erkennung ob sich `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` "
-"auf OpenSSH, plink oder tortoiseplink bezieht. Diese Variable 체berschreibt "
-"sie die Konfigurationseinstellung `ssh.variant` die den selben Zweck erf체llt."
+msgstr "Wenn diese Umgebungsvariable gesetzt ist, 체berschreibt sie Git's automatische Erkennung ob sich `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` auf OpenSSH, plink oder tortoiseplink bezieht. Diese Variable 체berschreibt sie die Konfigurationseinstellung `ssh.variant` die den selben Zweck erf체llt."
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr "Wenn diese Umgebungsvariable gesetzt ist, rufen Git-Befehle die Passw철rter ben철tigten (z.B. f체r HTTP- oder IMAP-Authentifizierung) dieses Programm mit geeigneten Kommandozeilenparametern auf und lesen das Passwort von seiner Standardausgabe. Siehe auch die Option `core.askPass` in linkgit:git-config[1]."
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr "Wenn diese Umgebungsvariable auf `0` gesetzt ist, fragt Git nicht nach Eingaben im Terminal (z.B. zur HTTP-Authentifizierung)."
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr "Gibt an, ob das Auslesen der Systemweiten Konfigurationsdatei `$(prefix)/etc/gitconfig` 체bersprungen wird. Diese Umgebungsvariable kann in Kombination mit `$HOME` und `$XDG_CONFIG_HOME` genutzt werden um eine reproduzierbare Umgebung f체r ein Skript herzustellen oder um eine fehlerhafte `/etc/gitconfig`-Datei vor체bergehend zu vermeiden, w채hrend man auf jemanden mit den n철tigen Berechtigungen um die Fehler zu beheben wartet."
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -53279,577 +53668,524 @@ msgstr ""
"Datei umgeleitet zu sein scheint oder nicht.\n"
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr "Aktiviert allgemeine Ablaufverfolgungsmeldungen, z.B.. Alias-Erweiterung, Ausf체hrung von eingebauten und externen Befehlen."
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr "Wenn diese Variable auf \"1\", \"2\" oder \"true\" (Vergleich ist unabh채ngig von Gro횩-/Kleinschreibung) gesetzt ist, werden Ablaufverfolgungsmeldungen nach stderr ausgegeben."
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr "Wenn dieser Variable ein ganzzahliger Wert gr철횩er als 2 und kleiner als 10 zugewiesen ist, interpretiert Git diesen Wert als ge철ffneten Datei-Handle und versucht die Ablaufverfolgungsmeldungen in diese Datei zu schreiben."
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr "Alternativ kann diese Variable auf einen absoluten Pfad (beginnt mit einem '/'), schreibt Git die Ablaufverfolgungsmeldungen in diese Datei."
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr "Zur체cksetzen der Variable oder setzen auf einen leeren Wert, \"0\" oder \"false\" (unabh채ngig von Gro횩-/Kleinschreibung) deaktiviert Ablaufverfolgungsmeldungen."
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr "Aktiviert Ablaufverfolgungsmeldungen f체r die Dateisystemmonitor-Erweiterung. Siehe `GIT_TRACE?` f체r verf체gbare Ausgabem철glichkeiten."
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr "Aktiviert Ablaufverfolgungsmeldungen f체r Zugriffe auf Pakete. F체r jeden Zugriff werden der Name der Paketdatei und ein Offset im Paket aufgezeichnet. Dies kann bei der Fehlersuche bei packetbezogenen Performance-Problemen hilfreich sein. Siehe `GIT_TRACE` f체r verf체gbare Ablaufverfolgungsoptionen."
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr "Aktiviert Ablaufverfolgungsmeldungen f체r alle Pakete, die in und aus einem bestimmten Programm kommen. Dies kann bei der Suche nach Problemen mit der Objektaushandlung oder anderen protokollbezogenen Problemen. Die Ablaufverfolgung wird bei Packeten, die mit pack beginnen deaktiviert (Siehe hierzu `GIT_TRACE_PACKFILE`). Siehe `GIT_TRACE` f체r verf체gbare Ablaufverfolgungsoptionen."
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr "Aktiviert die Ablaufverfolgung von gesendeten und empfangenen Packdateien eines bestimmten Programms. Im Gegensatz zu anderen Ablaufverfolgungsmeldungen ist diese Ablaufverfolgung wortgetreu: Keine Kopfzeilen und keine Umwandlung von bin채ren Daten. Sie wollen diese Daten h철chstwahrscheinlich in eine Datei umleiten (z.B. `GIT_TRACE_PACKFILE=/tmp/my.pack`), statt sie auf die Konsole auszugeben oder mit anderen Ablaufverfolgungsmeldungen zu vermischen."
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr "Dies ist momentan nur f체r die Client-Seite der Befehle clone und fetch implementiert."
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr "Aktiviert performancebezogene Ablaufverfolgungsmeldungen, z.B. gesamte Ausf체hrunszeit jedes Git-Befehls. Siehe `GIT_TRACE` f체r verf체gbare Ablaufverfolgungsoptionen."
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr "Aktiviert Ablaufverfolgungsmeldungen die zur Fehlersuche beim Anfordern (fetching)/Klonen von Repositories mit unvollst채ndiger Historie (shallow) helfen k철nnen. Siehe `GIT_TRACE` f체r verf체gbare Ablaufverfolgungsoptionen."
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr "Falls Curl-Ablaufverfolgung aktiviert ist (sieh `GIT_TRACE_CURL` oben), keine Nutzdaten, sondern nur Header und Info-Zeilen ausgegeben."
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr "Alternativ kann diese Variable auf einen absoluten Pfad (beginnt mit einem '/'), schreibt Git die Ablaufverfolgungsmeldungen in diese Datei. Falls der Pfad ein existierendes Verzeichnis ist, werden die Ablaufverfolgungsmeldungen in Dateien (eine pro Prozess), benannt nach dem letzten Teils der SID und einem optionalen Z채hler (um Datienamenskollisionen zu vermeiden), in diesem Verzeichnis geschrieben."
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr "Dies kann als Komma-getrennte Zeichenkettenliste gesetzt werden. Wenn Curl-Ablaufverfolgung aktiviert ist, werden immer, wenn ein \"Cookies:\"-header, der vom Client gesendet wurde ausgegeben wird, die Inhalte der Cookies, deren Schl체ssel in der Liste enthalten sind (Gro횩-/Kleinschreibung beachten) zensiert."
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr "Das Setzen dieser Variable auf 1 veranlasst Git alle Pfadspezifikationen buchst채blich und nicht als Glob-Muster zu interpreieren. Zum Beispiel sucht `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` nach Commits, die den Pfad `*.c` verr채ndern, nicht nach Dateien, die das Muster `*.c` betrifft. Das kann gewollt sein, wenn tats채chliche Pfade an Git 체bergeben werden (z.B. Pfade die von `git ls-tree` ausgegeben wurden oder aus Diffausgaben mit `--raw` o.채. stammen)."
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr "Das Setzen dieser Variable auf 1 veranlasst Git alle Pfadspezifikationen als Glob-Muster zu behandeln (Pfadspezifikationsangabe \"glob\")."
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr "Das Setzen dieser Variable auf 1 veranlasst Git alle Pfadspezifikationen buchst채blich zu interpreieren (Pfadspezifikationsangabe \"literal\")."
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr "Das Setzen dieser Variable auf 1 veranlasst Git bei allen Pfadspezifikationen Gro횩- und Kleinschreibung zu ignorieren."
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr "Wenn eine Referenz aktualisiert wird, werden Reflog-Eintr채ge erstellt, um den Grund, dass die Referenz aktualisiert wurde (체blicherweise ist das die Bezeichnung des hochrangigen Befehls, der die Referenz aktualisiert hat), sowie den alten und neuen Wert der Referenz nachvollziehen zu k철nnen. Geskriptete Porcelain-Befehle k철nnen die Hilfsfunktion set_reflog_action in `git-sh-setup` um ihren Namen in diese Variable einzutragen, wenn sie vom Endbenutzer als Befehl der obersten Ebene aufgerufen werden, damit dieser im Reflog festgehalten wird."
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr "Nur zum internen Gebrauch. Wird beim Handshake des Git Wire Protokolls verwendet. Enth채lt eine durch Doppelpunkte ':' getrennte Liste von Schl체sseln mit optionalen Werten 'schl체ssel[=wert]'. Unbekannte Schl체ssel und Werte m체ssen ignoriert werden."
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
-msgstr ""
-"Nur unter Windows: Erlaubt es die Standardeingabe/-ausgabe/-fehlerausgabe "
-"auf die in diesen Umgebungsvariablen angegebenen Pfade umzuleiten. Dies ist "
-"besonders hilfreich bei Multithreading-Anwendungen bei denen die "
-"Standardmethode diese Datenstr철me mit `CreateProcess()` keine Option ist, da "
-"das bewirken w체rde, dass alle weiteren Prozesse diese erben, was regul채re "
-"Git-Operationen blockieren kann. Der Hauptanwendungsfall ist die Verwendung "
-"von benannten Pipes (z.B. `\\\\.\\pipe\\my-git-stdin-123`)."
+msgstr "Nur unter Windows: Erlaubt es die Standardeingabe/-ausgabe/-fehlerausgabe auf die in diesen Umgebungsvariablen angegebenen Pfade umzuleiten. Dies ist besonders hilfreich bei Multithreading-Anwendungen bei denen die Standardmethode diese Datenstr철me mit `CreateProcess()` keine Option ist, da das bewirken w체rde, dass alle weiteren Prozesse diese erben, was regul채re Git-Operationen blockieren kann. Der Hauptanwendungsfall ist die Verwendung von benannten Pipes (z.B. `\\\\.\\pipe\\my-git-stdin-123`)."
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr "Es werden zwei besondere Werte unterst체tzt: `off` deaktiviert den entsprechenden Standarddatenstrom und wenn `GIT_REDIRECT_STDERR` auf `2>&1` gesetzt ist wird die Standardfehlerausgabe in den selben Strom wie die Standardausgabe geleitet."
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr "`GIT_PRINT_SHA1_ELLIPSIS` (veraltet)"
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr "Diskussion[[Discussion]]"
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr "Mehr Details zum den folgenden Themen sind im link:user-manual.html#git-concepts[Kapitel \"Git concepts\" des Benutzerhandbuchs] und unter linkgit:gitcore-tutorial[7] verf체gbar."
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
-msgstr ""
-"Ein Git-Projekt besteht normalerweise aus einem Arbeitsverzeichnis mit einem "
-"��.git��-Unterverzeichnis auf der obersten Ebene. Das ��.git��-Verzeichnis "
-"enth채lt unter anderem eine komprimierte Objektdatenbank, die den "
-"vollst채ndigen Projektverlauf wiedergibt, eine �얢ndex��-Datei, die diesen "
-"Verlauf mit dem aktuellen Inhalt des Arbeitsbereichs verkn체pft und Pointer "
-"in diesem Verlauf benennt, wie z.B. Tags und Branch-Heads."
+msgstr "Ein Git-Projekt besteht normalerweise aus einem Arbeitsverzeichnis mit einem ��.git��-Unterverzeichnis auf der obersten Ebene. Das ��.git��-Verzeichnis enth채lt unter anderem eine komprimierte Objektdatenbank, die den vollst채ndigen Projektverlauf wiedergibt, eine �얢ndex��-Datei, die diesen Verlauf mit dem aktuellen Inhalt des Arbeitsbereichs verkn체pft und Pointer in diesem Verlauf benennt, wie z.B. Tags und Branch-Heads."
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
-msgstr ""
-"Die Objektdatenbank enth채lt drei Hauptarten von Objekten: Blobs, die "
-"Dateiinformationen enthalten; Trees, die auf Blobs und andere Trees "
-"verweisen, um Verzeichnisstrukturen abzubilden; und Commits, die jeweils auf "
-"einen einzelnen Tree und eine gewisse Anzahl Eltern-Commits verweisen."
+msgstr "Die Objektdatenbank enth채lt drei Hauptarten von Objekten: Blobs, die Dateiinformationen enthalten; Trees, die auf Blobs und andere Trees verweisen, um Verzeichnisstrukturen abzubilden; und Commits, die jeweils auf einen einzelnen Tree und eine gewisse Anzahl Eltern-Commits verweisen."
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
-msgstr ""
-"Der Commit, in anderen Systemen auch �얚hangeset�� oder �얰ersion�� genannt, "
-"stellt einen Schritt in der Projekthistorie dar und jeder Eltern-Commit "
-"stellt einen direkt vorhergehenden Schritt dar. Commits mit mehr als einem "
-"Eltern-Commit stellen Zusammenf체hrungen verschiedener Entwicklungslinien dar."
+msgstr "Der Commit, in anderen Systemen auch �얚hangeset�� oder �얰ersion�� genannt, stellt einen Schritt in der Projekthistorie dar und jeder Eltern-Commit stellt einen direkt vorhergehenden Schritt dar. Commits mit mehr als einem Eltern-Commit stellen Zusammenf체hrungen verschiedener Entwicklungslinien dar."
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
-msgstr ""
-"Alle Objekte werden mit dem SHA1-Hash ihres Inhalts bezeichnet. Dieser wird "
-"normalerweise als 40-stellige Hexadezimalzahl angegeben. Diese Bezeichnungen "
-"sind eindeutig. Ein einzelner signierter Commit kann die gesamte Historie "
-"bis zu diesem Commit verifizieren. Zu diesem Zweck wird eine vierte "
-"Objektart, die Markierung angeboten."
+msgstr "Alle Objekte werden mit dem SHA1-Hash ihres Inhalts bezeichnet. Dieser wird normalerweise als 40-stellige Hexadezimalzahl angegeben. Diese Bezeichnungen sind eindeutig. Ein einzelner signierter Commit kann die gesamte Historie bis zu diesem Commit verifizieren. Zu diesem Zweck wird eine vierte Objektart, die Markierung angeboten."
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
-msgstr ""
-"Beim Erstellen werden Objekte in individuellen Dateien gespeichert, k철nnen "
-"aber aus Effizienzgr체nden sp채ter zusammen in sogenannten Packdateien "
-"komprimiert werden."
+msgstr "Beim Erstellen werden Objekte in individuellen Dateien gespeichert, k철nnen aber aus Effizienzgr체nden sp채ter zusammen in sogenannten Packdateien komprimiert werden."
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
-msgstr ""
-"Benannte Zeiger, die Referenzen genannt werden, markieren interessante "
-"Punkte in der Historie. Eine Referenz kann auf ein Objekt oder eine andere "
-"Referenz verweisen. Referenzen deren Bezeichnung mit `ref/head/` beginnt "
-"enthalten die SHA1-Bezeichnung de letzten Commits (der �얭pitze��) eines "
-"Entwicklungszweigs. SHA1-Bezeichnungen interessanter Markierungen werden "
-"unter `ref/tags/` gespeichert. Eine besondere Referenz namens `HEAD` "
-"verweist auf die Bezeichnung des momnentan ausgecheckten Entwicklungszweigs."
+msgstr "Benannte Zeiger, die Referenzen genannt werden, markieren interessante Punkte in der Historie. Eine Referenz kann auf ein Objekt oder eine andere Referenz verweisen. Referenzen deren Bezeichnung mit `ref/head/` beginnt enthalten die SHA1-Bezeichnung de letzten Commits (der �얭pitze��) eines Entwicklungszweigs. SHA1-Bezeichnungen interessanter Markierungen werden unter `ref/tags/` gespeichert. Eine besondere Referenz namens `HEAD` verweist auf die Bezeichnung des momnentan ausgecheckten Entwicklungszweigs."
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
-msgstr ""
-"Die Indexdatei wird mit einer Liste aller Pfade, sowie pro Pfad einem Blob-"
-"Objekt und einer Reihe von Attributen initialisiert. Das Blob-Objekt "
-"repr채sentiert die Inhalte der Datei gem채횩 der Spitze des aktuellen "
-"Entwicklungszweigs. Die Attribute (zuletzt ge채ndert, Gr철횩e, etc.) werden von "
-"der entsprechenden Datei im Arbeitsverzeichnis genommen. Sp채tere 횆nderungen "
-"am Arbeitsverzeichnis k철nnen durch Vergleichen dieser Attribute ermittelt "
-"werden. Der Index kann mit neuen Inhalten aktualisiert werden und aus dem "
-"Inhalt des Indexes k철nnen neue Commits erstellt werden."
+msgstr "Die Indexdatei wird mit einer Liste aller Pfade, sowie pro Pfad einem Blob-Objekt und einer Reihe von Attributen initialisiert. Das Blob-Objekt repr채sentiert die Inhalte der Datei gem채횩 der Spitze des aktuellen Entwicklungszweigs. Die Attribute (zuletzt ge채ndert, Gr철횩e, etc.) werden von der entsprechenden Datei im Arbeitsverzeichnis genommen. Sp채tere 횆nderungen am Arbeitsverzeichnis k철nnen durch Vergleichen dieser Attribute ermittelt werden. Der Index kann mit neuen Inhalten aktualisiert werden und aus dem Inhalt des Indexes k철nnen neue Commits erstellt werden."
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
-msgstr ""
-"Der Index kann auch mehrere Eintr채ge (genannt �얭tages��) eines bestimmten "
-"Pfads enthalten. Diese Stages enthalten verschiedene noch nicht "
-"zusammengef체hrte Versionen einer Datei w채hrend eines Merges."
+msgstr "Der Index kann auch mehrere Eintr채ge (genannt �얭tages��) eines bestimmten Pfads enthalten. Diese Stages enthalten verschiedene noch nicht zusammengef체hrte Versionen einer Datei w채hrend eines Merges."
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr "WEITERE DOKUMENTATION"
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
-msgstr ""
-"Siehe die Verweise im Abschnitt �얙eschreibung�� um mit der Verwendung von Git "
-"zu beginnen. Nachfolgend finden Sie vermutlich mehr Details als es f체r einen "
-"erstmaligen Benutzer n철tig ist."
+msgstr "Siehe die Verweise im Abschnitt �얙eschreibung�� um mit der Verwendung von Git zu beginnen. Nachfolgend finden Sie vermutlich mehr Details als es f체r einen erstmaligen Benutzer n철tig ist."
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
-msgstr ""
-"Das link:user-manual.html#git-concepts[Kapitel �얟it concepts�� des "
-"Benutzerhandbuchs] und linkgit:gitcore-tutorial[7] stellen eine Einf체hrung "
-"in die zugrundeliegende Git-Architektur zur Verf체gung."
+msgstr "Das link:user-manual.html#git-concepts[Kapitel �얟it concepts�� des Benutzerhandbuchs] und linkgit:gitcore-tutorial[7] stellen eine Einf체hrung in die zugrundeliegende Git-Architektur zur Verf체gung."
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr "Siehe linkgit:gitworkflows[7] f체r eine 횥bersicht 체ber empfohlene Arbeitsabl채ufe."
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr "In den link:howto-index.html[Howto]-Dokumenten finden Sie n체tzliche Beispiele."
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr "Die Interna sind in der link:technical/api-index.html[Git-API-Dokumentation] dokumentiert."
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr "F체r Benutzer, die von CVS migrieren k철nnte auch linkgit:gitcvs-migration[7] interessant sein."
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr "Autoren"
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr "Git wurde urspr체nglich von Linus Torvalds geschrieben und wird jetzt von Junio C Hamano weitergef체hrt. Zahlreiche Beitr채ge sind 체ber die Git-E-Mail-Verteilerliste <git@vger.kernel.org> entstanden. Unter http://www.openhub.net/p/git/contributors/summary steht eine etwas vollst채ndigere Liste der Mitwirkenden bereit."
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr "Wenn sie einen Klon von git.git haben, k철nnen Sie sich mit linkgit:git-shortlog[1] und linkgit:git-blame[1] die Urheber einzelner Projektteile anzeigen lassen."
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr "Fehler melden"
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, fuzzy, priority:100
#| msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://public-inbox.org/git for previous bug reports and other discussions."
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr "Melden Sie Fehler (auf Englisch) an die Git-E-Mail-Verteilerliste <git@vger.kernel.org>. Sie m체ssen die Verteilerliste nicht abonieren um eine Nachricht zu senden. Bisherige Fehlermeldungen und andere Diskusionen k철nnen im Listenarchiv unter https://public-inbox.org/git eingesehen werden."
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr "Sicherheitsrelevante Fehler sollten vetraulich an die Git-Sicherheits-E-Mail-Verteilerliste <git-security@googlegroups.com> gemeldet werden."
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[Das Git-Benutzerhandbuch], linkgit:gitworkflows[7]"
@@ -54830,7 +55166,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr "The remote configuration is achieved using the `remote.origin.url` and `remote.origin.fetch` configuration variables. (See linkgit:git-config[1]). Die Konfiguration entfernter Repositories wird durch die Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` erreicht. (Siehe linkgit:git-config[1])."
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -59183,7 +59531,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
@@ -59620,185 +59968,198 @@ msgstr "Signieren eines Commits verwendet wurde"
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, fuzzy, priority:260
+#| msgid "show the key used to sign a signed commit"
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr "zeige den Schl체ssel, der zum signieren eines Commits verwendet wurde"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr "'tformat:'"
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -59808,7 +60169,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -59818,13 +60179,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -62816,6 +63177,21 @@ msgstr ""
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+#, fuzzy, ignore-ellipsis
+#~ msgid "<file>..."
+#~ msgstr ""
+#~ "#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
+#~ "<file>...\n"
+#~ "#-#-#-#-# git-rm-de.po (PACKAGE VERSION) #-#-#-#-#\n"
+#~ "<Datei>..."
+
+#, fuzzy
+#~ msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
+#~ msgstr "Die <Datei> Liste die an den Befehl 체bergeben wird, kann genaue Dateinamen, Dateisuchkriterien oder f체hrende Verzeichnisnamen beinhalten. 'git-rm' wird allerdings nur jene Dateien entfernen, von deren Existenz git wei횩. Wird eine Datei angegeben die von git noch nicht verwaltet wird, so wird sie nicht entfernt."
+
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "Siehe linkgit:git-commit-tree[1]"
+
#~ msgid "create <file>"
#~ msgstr "create <Datei>"
diff --git a/po/documentation.es.po b/po/documentation.es.po
index 46bc815..103336e 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -7,2565 +7,2262 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
+"PO-Revision-Date: 2020-04-04 19:04+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "-b"
msgstr "-b"
#. type: Plain text
#: en/blame-options.txt:4
-msgid ""
-"Show blank SHA-1 for boundary commits. This can also be controlled via the "
-"`blame.blankboundary` config option."
+#, priority:100
+msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankboundary` config option."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
-#, no-wrap
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
#. type: Plain text
#: en/blame-options.txt:8
-msgid ""
-"Do not treat root commits as boundaries. This can also be controlled via "
-"the `blame.showRoot` config option."
+#, priority:100
+msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-stats"
msgstr "--show-stats"
#. type: Plain text
#: en/blame-options.txt:11
+#, priority:100
msgid "Include additional statistics at the end of blame output."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "-L <start>,<end>"
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "-L :<funcname>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:16
-msgid ""
-"Annotate only the given line range. May be specified multiple times. "
-"Overlapping ranges are allowed."
+#, priority:100
+msgid "Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed."
msgstr ""
#. type: Plain text
#: en/blame-options.txt:19
-msgid ""
-"<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from "
-"<start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
+#, priority:100
+msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
-#, no-wrap
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
#. type: Plain text
#: en/blame-options.txt:24
+#, priority:100
msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
-#, no-wrap
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
#. type: Plain text
#: en/blame-options.txt:27
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show raw timestamp (Default: off)."
msgstr "Mostrar timestamp en formato raw (Default: off)"
#. type: Labeled list
#: en/blame-options.txt:28
-#, no-wrap
+#, no-wrap, priority:100
msgid "-S <revs-file>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
#. type: Labeled list
#: en/blame-options.txt:31
-#, no-wrap
+#, no-wrap, priority:100
msgid "--reverse <rev>..<rev>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:38
-msgid ""
-"Walk history forward instead of backward. Instead of showing the revision in "
-"which a line appeared, this shows the last revision in which a line has "
-"existed. This requires a range of revision like START..END where the path to "
-"blame exists in START. `git blame --reverse START` is taken as `git blame "
-"--reverse START..HEAD` for convenience."
+#, priority:100
+msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
-#, no-wrap
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--porcelain"
msgstr "--porcelain"
#. type: Plain text
#: en/blame-options.txt:42
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show in a format designed for machine consumption."
msgstr "Mostrar en un formato dise챰ado para consumo de m찼quina"
#. type: Labeled list
#: en/blame-options.txt:43
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--line-porcelain"
msgstr "--line-porcelain"
#. type: Plain text
#: en/blame-options.txt:47
-msgid ""
-"Show the porcelain format, but output commit information for each line, not "
-"just the first time a commit is referenced. Implies --porcelain."
+#, priority:100
+msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--incremental"
msgstr "--incremental"
#. type: Plain text
#: en/blame-options.txt:51
+#, priority:100
msgid "Show the result incrementally in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:52 en/git-mailinfo.txt:62 en/pretty-options.txt:35
-#, no-wrap
+#, no-wrap, priority:260
msgid "--encoding=<encoding>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:58
-msgid ""
-"Specifies the encoding used to output author names and commit "
-"summaries. Setting it to `none` makes blame output unconverted data. For "
-"more information see the discussion about encoding in the linkgit:git-log[1] "
-"manual page."
+#, priority:100
+msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:59
-#, no-wrap
+#, no-wrap, priority:100
msgid "--contents <file>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:65
-msgid ""
-"When <rev> is not specified, the command annotates the changes starting "
-"backwards from the working tree copy. This flag makes the command pretend "
-"as if the working tree copy has the contents of the named file (specify `-` "
-"to make the command read from the standard input)."
+#, priority:100
+msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:66
-#, no-wrap
+#, no-wrap, priority:100
msgid "--date <format>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:72
-msgid ""
-"Specifies the format used to output dates. If --date is not provided, the "
-"value of the blame.date config variable is used. If the blame.date config "
-"variable is also not set, the iso format is used. For supported values, see "
-"the discussion of the --date option at linkgit:git-log[1]."
+#, priority:100
+msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:73 en/git-fsck.txt:100
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]progress"
msgstr "--[no-]progress"
#. type: Plain text
#: en/blame-options.txt:79
-msgid ""
-"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal. This flag enables progress reporting even if not "
-"attached to a terminal. Can't use `--progress` together with `--porcelain` "
-"or `--incremental`."
+#, priority:100
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal. This flag enables progress reporting even if not attached to a terminal. Can't use `--progress` together with `--porcelain` or `--incremental`."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:80
-#, no-wrap
+#, no-wrap, priority:100
msgid "-M[<num>]"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:90
-msgid ""
-"Detect moved or copied lines within a file. When a commit moves or copies a "
-"block of lines (e.g. the original file has A and then B, and the commit "
-"changes it to B and then A), the traditional 'blame' algorithm notices only "
-"half of the movement and typically blames the lines that were moved up "
-"(i.e. B) to the parent and assigns blame to the lines that were moved down "
-"(i.e. A) to the child commit. With this option, both groups of lines are "
-"blamed on the parent by running extra passes of inspection."
+#, priority:100
+msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection."
msgstr ""
#. type: Plain text
#: en/blame-options.txt:95
-msgid ""
-"<num> is optional but it is the lower bound on the number of alphanumeric "
-"characters that Git must detect as moving/copying within a file for it to "
-"associate those lines with the parent commit. The default value is 20."
+#, priority:100
+msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:96
-#, no-wrap
+#, no-wrap, priority:100
msgid "-C[<num>]"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:105
-msgid ""
-"In addition to `-M`, detect lines moved or copied from other files that were "
-"modified in the same commit. This is useful when you reorganize your "
-"program and move code around across files. When this option is given twice, "
-"the command additionally looks for copies from other files in the commit "
-"that creates the file. When this option is given three times, the command "
-"additionally looks for copies from other files in any commit."
+#, priority:100
+msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit."
msgstr ""
#. type: Plain text
#: en/blame-options.txt:112
-msgid ""
-"<num> is optional but it is the lower bound on the number of alphanumeric "
-"characters that Git must detect as moving/copying between files for it to "
-"associate those lines with the parent commit. And the default value is "
-"40. If there are more than one `-C` options given, the <num> argument of the "
-"last `-C` will take effect."
+#, priority:100
+msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the <num> argument of the last `-C` will take effect."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:113
-#, no-wrap
+#, no-wrap, priority:100
msgid "--ignore-rev <rev>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:124
-msgid ""
-"Ignore changes made by the revision when assigning blame, as if the change "
-"never happened. Lines that were changed or added by an ignored commit will "
-"be blamed on the previous commit that changed that line or nearby lines. "
-"This option may be specified multiple times to ignore more than one "
-"revision. If the `blame.markIgnoredLines` config option is set, then lines "
-"that were changed by an ignored commit and attributed to another commit will "
-"be marked with a `?` in the blame output. If the "
-"`blame.markUnblamableLines` config option is set, then those lines touched "
-"by an ignored commit that we could not attribute to another revision are "
-"marked with a '*'."
+#, priority:100
+msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:125
-#, no-wrap
+#, no-wrap, priority:100
msgid "--ignore-revs-file <file>"
msgstr ""
#. type: Plain text
#: en/blame-options.txt:131
-msgid ""
-"Ignore revisions listed in `file`, which must be in the same format as an "
-"`fsck.skipList`. This option may be repeated, and these files will be "
-"processed after any files specified with the `blame.ignoreRevsFile` config "
-"option. An empty file name, `\"\"`, will clear the list of revs from "
-"previously processed files."
+#, priority:100
+msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
-#, no-wrap
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
#. type: Plain text
#: en/blame-options.txt:133
+#, priority:100
msgid "Show help message."
msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:233
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "Annotate file lines with commit information."
msgstr "Anotar l챠neas de archivo con informaci처n de commit"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show what revision and author last modified each line of a file."
-msgstr ""
-"Mostrar qu챕 revisi처n y autor modificaron al 첬ltimo cada l챠nea de un archivo"
+msgstr "Mostrar qu챕 revisi처n y autor modificaron al 첬ltimo cada l챠nea de un archivo"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr "Contar n첬mero de objetos no empaquetados y su consumo en disco"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show changes using common diff tools."
msgstr "Mostrar cambios usando herramientas de diff comunes"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
-#, fuzzy
+#, fuzzy, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
-msgstr ""
-"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
+msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:18
-#, fuzzy
+#, fuzzy, priority:100
msgid "Display help information about Git."
msgstr "Mostrar informaci처n sobre Git"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:21
-#, fuzzy
+#, fuzzy, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr "Buscar instant찼neamente tu repositorio de trabajo en gitweb"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:24
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show three-way merge without touching index."
msgstr "Mostrar fusi처n de tres v챠as sin tocar el 챠ndice"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:27
-#, fuzzy
+#, fuzzy, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr "Reutilizar la resoluci처n registrada de fusiones conflictivas"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show branches and their commits."
msgstr "Mostrar ramas y sus commits"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:33
-#, fuzzy
+#, fuzzy, priority:100
msgid "Check the GPG signature of commits."
msgstr "Verificar firma GPG de commits"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:36
-#, fuzzy
+#, fuzzy, priority:100
msgid "Check the GPG signature of tags."
msgstr "Verifica la firma GPG de etiquetas"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:39
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show logs with difference each commit introduces."
msgstr "Muestra logs con las diferencias que cada commit introduce"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:42
-#, fuzzy
+#, fuzzy, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "Interfaz web Git (interfaz web para repositorios Git)"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "Get and set repository or global options."
msgstr "Configurar repositorio u opciones globales"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1543
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Git data exporter."
msgstr "Exportador de data Git"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Backend for fast Git data importers."
msgstr "Backend para importadores de data de Git r찼pidos"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "Rewrite branches."
msgstr "Reescribir ramas"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:15
-#, fuzzy
+#, fuzzy, priority:100
msgid "Run merge conflict resolution tools to resolve merge conflicts."
-msgstr ""
-"Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver "
-"conflictos de fusi처n"
+msgstr "Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver conflictos de fusi처n"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:18
-#, fuzzy
+#, fuzzy, priority:100
msgid "Pack heads and tags for efficient repository access."
msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:21
-#, fuzzy
+#, fuzzy, priority:100
msgid "Prune all unreachable objects from the object database."
msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:24
-#, fuzzy
+#, fuzzy, priority:100
msgid "Manage reflog information."
msgstr "Gestionar informaci처n de reflog"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:27
-#, fuzzy
+#, fuzzy, priority:100
msgid "Manage set of tracked repositories."
msgstr "Gestiona un conjunto de repositorios rastreados"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "Pack unpacked objects in a repository."
msgstr "Empaquetar objetos no empaquetados en un repositorio"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:33
-#, fuzzy
+#, fuzzy, priority:100
msgid "Create, list, delete refs to replace objects."
msgstr "Crea, lista, borra referencias para reemplazar objetos"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "Import a GNU Arch repository into Git."
msgstr "Importar un repositorio GNU Arch en Git"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Export a single commit to a CVS checkout."
msgstr "Exporta un commit 첬nico a CVS checkout"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Salvage your data out of another SCM people love to hate."
msgstr "Salva tus datos de otro SCM que la gente adora odiar"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "A CVS server emulator for Git."
msgstr "Un servidor emulador de CVS para Git"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:15
-#, fuzzy
+#, fuzzy, priority:100
msgid "Send a collection of patches from stdin to an IMAP folder."
msgstr "Enviar una colecci처n de parches de stdin a una carpeta IMAP"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:18
-#, fuzzy
+#, fuzzy, priority:100
msgid "Import from and submit to Perforce repositories."
msgstr "Importar desde y enviar a repositorios Perforce"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:21
-#, fuzzy
+#, fuzzy, priority:100
msgid "Applies a quilt patchset onto the current branch."
msgstr "Aplica un parche quilt en la rama actual"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:24
-#, fuzzy
+#, fuzzy, priority:100
msgid "Generates a summary of pending changes."
msgstr "Genera un resumen de cambios pendientes"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:27
-#, fuzzy
+#, fuzzy, priority:100
msgid "Send a collection of patches as emails."
msgstr "Env챠a una colecci처n de parches como e-mails"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "Bidirectional operation between a Subversion repository and Git."
msgstr "Operaci처n bidireccional entre un repositorio Subversion y Git"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
-#, no-wrap
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "Add file contents to the index."
msgstr "Agrega contenido de carpetas al 챠ndice"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Apply a series of patches from a mailbox."
msgstr "Aplicar una serie de parches de un mailbox"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Create an archive of files from a named tree."
msgstr "Crear un archivo o archivos de un 찼rbol nombrado"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "Use binary search to find the commit that introduced a bug."
msgstr "Use la b첬squeda binaria para encontrar el commit que introdujo el bug"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:15
-#, fuzzy
+#, fuzzy, priority:100
msgid "List, create, or delete branches."
msgstr "Lista, crea, o borra ramas"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:18
-#, fuzzy
+#, fuzzy, priority:100
msgid "Move objects and refs by archive."
msgstr "Mover objetos y referencias por archivo"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:21
-#, fuzzy
+#, fuzzy, priority:100
msgid "Switch branches or restore working tree files."
msgstr "Cambia ramas o restaura los archivos de tu 찼rbol de trabajo"
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:139
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:24
-#, fuzzy
+#, fuzzy, priority:100
msgid "Apply the changes introduced by some existing commits."
msgstr "Aplica los cambios introducidos por algunos commits existentes"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:27
-#, fuzzy
+#, fuzzy, priority:100
msgid "Graphical alternative to git-commit."
msgstr "Opci처n gr찼fica a git-commit"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "Remove untracked files from the working tree."
msgstr "Remueve archivos del 찼rbol de trabajo no rastreados"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:33
-#, fuzzy
+#, fuzzy, priority:100
msgid "Clone a repository into a new directory."
msgstr "Clona un repositorio dentro de un nuevo directorio"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:36
-#, fuzzy
+#, fuzzy, priority:100
msgid "Record changes to the repository."
msgstr "Graba los cambios en tu repositorio"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:39
-#, fuzzy
+#, fuzzy, priority:100
msgid "Give an object a human readable name based on an available ref."
-msgstr ""
-"Dar a un objeto un nombre legible por humanos basado en una referencia "
-"disponible"
+msgstr "Dar a un objeto un nombre legible por humanos basado en una referencia disponible"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:42
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show changes between commits, commit and working tree, etc."
msgstr "Muestra los cambios entre commits, commit y 찼rbol de trabajo, etc"
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:45
-#, fuzzy
+#, fuzzy, priority:100
msgid "Download objects and refs from another repository."
msgstr "Descarga objetos y referencias de otro repositorio"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:48
-#, fuzzy
+#, fuzzy, priority:100
msgid "Prepare patches for e-mail submission."
msgstr "Prepara parches para ser enviados por e-mail"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:51
-#, fuzzy
+#, fuzzy, priority:100
msgid "Cleanup unnecessary files and optimize the local repository."
msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:54
-#, fuzzy
+#, fuzzy, priority:100
msgid "Print lines matching a pattern."
msgstr "Imprime las l챠neas que concuerdan con el patron"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:57
-#, fuzzy
+#, fuzzy, priority:100
msgid "A portable graphical interface to Git."
msgstr "Una interfaz gr찼fica port찼til para Git"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:60
-#, fuzzy
+#, fuzzy, priority:100
msgid "Create an empty Git repository or reinitialize an existing one."
msgstr "Crea un repositorio de Git vac챠o o reinicia el que ya existe"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:63
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show commit logs."
msgstr "Muestra los logs de los commits"
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:66
-#, fuzzy
+#, fuzzy, priority:100
msgid "Join two or more development histories together."
msgstr "Junta dos o m찼s historiales de desarrollo juntos"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:69
-#, fuzzy
+#, fuzzy, priority:100
msgid "Move or rename a file, a directory, or a symlink."
msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simb처licos"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:72
-#, fuzzy
+#, fuzzy, priority:100
msgid "Add or inspect object notes."
msgstr "Agrega o inspecciona objetos nota"
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:75
-#, fuzzy
+#, fuzzy, priority:100
msgid "Fetch from and integrate with another repository or a local branch."
msgstr "Realiza un fetch e integra con otro repositorio o rama local"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:78
-#, fuzzy
+#, fuzzy, priority:100
msgid "Update remote refs along with associated objects."
msgstr "Actualiza referencias remotas junto con sus objetos asociados"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:79
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-range-diff[1]"
msgstr "linkgit:git-range-diff[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:81
-#, fuzzy
+#, fuzzy, priority:100
msgid "Compare two commit ranges (e.g. two versions of a branch)."
msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)"
#. type: Plain text
#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1172
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:84
-#, fuzzy
+#, fuzzy, priority:100
msgid "Reapply commits on top of another base tip."
msgstr "Vuelve a aplicar commits en la punta de otra rama"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:85
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:87
-#, fuzzy
+#, fuzzy, priority:100
msgid "Reset current HEAD to the specified state."
msgstr "Reinicia el HEAD actual a un estado especifico"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-restore[1]"
msgstr "linkgit:git-restore[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:90
-#, fuzzy
+#, fuzzy, priority:100
msgid "Restore working tree files."
msgstr "Restaurar archivos de 찼rboles de trabajo"
#. type: Plain text
#: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:240
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:93
-#, fuzzy
+#, fuzzy, priority:100
msgid "Revert some existing commits."
msgstr "Revierte algunos commits existentes"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:96
-#, fuzzy
+#, fuzzy, priority:100
msgid "Remove files from the working tree and from the index."
msgstr "Borra archivos del 찼rbol de trabajo y del 챠ndice"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:99
-#, fuzzy
+#, fuzzy, priority:100
msgid "Summarize 'git log' output."
msgstr "Resumir la salida 'git log'"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:102
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show various types of objects."
msgstr "Muestra varios tipos de objetos"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:105
-#, fuzzy
+#, fuzzy, priority:100
msgid "Stash the changes in a dirty working directory away."
-msgstr ""
-"Poner en un stash los cambios en un directorio de trabajo sucio de todas "
-"maneras"
+msgstr "Poner en un stash los cambios en un directorio de trabajo sucio de todas maneras"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:108
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show the working tree status."
msgstr "Muestra el estado del 찼rbol de trabajo"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:111
-#, fuzzy
+#, fuzzy, priority:100
msgid "Initialize, update or inspect submodules."
msgstr "Inicializa, actualiza o inspecciona subm처dulos"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:114
-#, fuzzy
+#, fuzzy, priority:100
msgid "Switch branches."
msgstr "Cambiar branches"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:115
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:117
-#, fuzzy
+#, fuzzy, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:118
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:120
-#, fuzzy
+#, fuzzy, priority:100
msgid "Manage multiple working trees."
msgstr "Gestiona m첬ltiples 찼rboles de trabajo"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:123
-#, fuzzy
+#, fuzzy, priority:100
msgid "The Git repository browser."
msgstr "El navegador de repositorio Git"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cat-file[1]"
msgstr "linkgit:git-cat-file[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "Provide content or type and size information for repository objects."
-msgstr ""
-"Proveer contenido o tipo y tama챰o de informaci처n para objetos de repositorio"
+msgstr "Proveer contenido o tipo y tama챰o de informaci처n para objetos de repositorio"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-cherry[1]"
msgstr "linkgit:git-cherry[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Find commits yet to be applied to upstream."
msgstr "Encuentra commits que faltan aplicar en upstream"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-files[1]"
msgstr "linkgit:git-diff-files[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Compares files in the working tree and the index."
msgstr "Compara archivos del 찼rbol de trabajo y del 챠ndice"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-index[1]"
msgstr "linkgit:git-diff-index[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "Compare a tree to the working tree or index."
msgstr "Compara un 찼rbol con el 찼rbol de trabajo o 챠ndice"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-diff-tree[1]"
msgstr "linkgit:git-diff-tree[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:15
-#, fuzzy
+#, fuzzy, priority:100
msgid "Compares the content and mode of blobs found via two tree objects."
-msgstr ""
-"Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos "
-"de 찼rbol"
+msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-for-each-ref[1]"
msgstr "linkgit:git-for-each-ref[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:18
-#, fuzzy
+#, fuzzy, priority:100
msgid "Output information on each ref."
msgstr "Informaci처n de output en cada ref"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr "linkgit:git-get-tar-commit-id[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:21
-#, fuzzy
+#, fuzzy, priority:100
msgid "Extract commit ID from an archive created using git-archive."
msgstr "Extrae el ID de commit de un archivo creado usando git-archive"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-files[1]"
msgstr "linkgit:git-ls-files[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:24
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show information about files in the index and the working tree."
msgstr "Muestra informaci처n sobre archivos in el 챠ndice y el 찼rbol de trabajo"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-remote[1]"
msgstr "linkgit:git-ls-remote[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:27
-#, fuzzy
+#, fuzzy, priority:100
msgid "List references in a remote repository."
msgstr "Lista referencias en un repositorio remoto"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-ls-tree[1]"
msgstr "linkgit:git-ls-tree[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "List the contents of a tree object."
msgstr "Lista los contenidos de un objeto 찼rbol"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-base[1]"
msgstr "linkgit:git-merge-base[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:33
-#, fuzzy
+#, fuzzy, priority:100
msgid "Find as good common ancestors as possible for a merge."
msgstr "Encuentra un ancestro com첬n bueno para una posible fusi처n"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:36
-#, fuzzy
+#, fuzzy, priority:100
msgid "Find symbolic names for given revs."
msgstr "Encontrar nombres simb처licos para revs dados"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-redundant[1]"
msgstr "linkgit:git-pack-redundant[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:39
-#, fuzzy
+#, fuzzy, priority:100
msgid "Find redundant pack files."
msgstr "Encuentra archivos empaquetados de manera redundante"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:40
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rev-list[1]"
msgstr "linkgit:git-rev-list[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:42
-#, fuzzy
+#, fuzzy, priority:100
msgid "Lists commit objects in reverse chronological order."
msgstr "Lista objetos commit en orden cronol처gico inverso"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rev-parse[1]"
msgstr "linkgit:git-rev-parse[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:45
-#, fuzzy
+#, fuzzy, priority:100
msgid "Pick out and massage parameters."
msgstr "Seleccionar y masajear los par찼metros"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-index[1]"
msgstr "linkgit:git-show-index[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:48
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show packed archive index."
msgstr "Mostrar el 챠ndice de archivo empaquetado"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:51
-#, fuzzy
+#, fuzzy, priority:100
msgid "List references in a local repository."
msgstr "Listar referencias en el repositorio local"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:52
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-unpack-file[1]"
msgstr "linkgit:git-unpack-file[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:54
-#, fuzzy
+#, fuzzy, priority:100
msgid "Creates a temporary file with a blob's contents."
msgstr "Crea un archivo temporal con contenidos de un blob"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:55
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-var[1]"
msgstr "linkgit:git-var[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:57
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show a Git logical variable."
msgstr "Mostrar una variable l처gica de Git"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:58
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-pack[1]"
msgstr "linkgit:git-verify-pack[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:60
-#, fuzzy
+#, fuzzy, priority:100
msgid "Validate packed Git archive files."
msgstr "Valida archivos Git empaquetados"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-apply[1]"
msgstr "linkgit:git-apply[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "Apply a patch to files and/or to the index."
msgstr "Aplicar un parche a archivos y/o el 챠ndice"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-checkout-index[1]"
msgstr "linkgit:git-checkout-index[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Copy files from the index to the working tree."
msgstr "Copiar archivos del 챠ndice al 찼rbol de trabajo"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit-graph[1]"
msgstr "linkgit:git-commit-graph[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Write and verify Git commit-graph files."
msgstr "Escribe y verifica los archivos de Git commit-graph"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-commit-tree[1]"
msgstr "linkgit:git-commit-tree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "Create a new commit object."
msgstr "Crea un nuevo objeto commit"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-hash-object[1]"
msgstr "linkgit:git-hash-object[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:15
-#, fuzzy
+#, fuzzy, priority:100
msgid "Compute object ID and optionally creates a blob from a file."
msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-index-pack[1]"
msgstr "linkgit:git-index-pack[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:18
-#, fuzzy
+#, fuzzy, priority:100
msgid "Build pack index file for an existing packed archive."
msgstr "Constuye un archivo de 챠ndice para un archivo empaquetado existente"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-file[1]"
msgstr "linkgit:git-merge-file[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:21
-#, fuzzy
+#, fuzzy, priority:100
msgid "Run a three-way file merge."
msgstr "Ejecuta una fusi처n de tres v챠as en un archivo"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-index[1]"
msgstr "linkgit:git-merge-index[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:24
-#, fuzzy
+#, fuzzy, priority:100
msgid "Run a merge for files needing merging."
msgstr "Ejecuta una fusi처n para archivos que la necesitan"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mktag[1]"
msgstr "linkgit:git-mktag[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:27
-#, fuzzy
+#, fuzzy, priority:100
msgid "Creates a tag object."
msgstr "Crea un objeto tag"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mktree[1]"
msgstr "linkgit:git-mktree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "Build a tree-object from ls-tree formatted text."
msgstr "Construir un objeto 찼rbol de un texto en formato ls-tree"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-multi-pack-index[1]"
msgstr "linkgit:git-multi-pack-index[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:33
-#, fuzzy
+#, fuzzy, priority:100
msgid "Write and verify multi-pack-indexes."
msgstr "Escribe y verifica archivos multi-pack-index"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-pack-objects[1]"
msgstr "linkgit:git-pack-objects[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:36
-#, fuzzy
+#, fuzzy, priority:100
msgid "Create a packed archive of objects."
msgstr "Crea un archivo de objetos empaquetados"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-prune-packed[1]"
msgstr "linkgit:git-prune-packed[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:39
-#, fuzzy
+#, fuzzy, priority:100
msgid "Remove extra objects that are already in pack files."
msgstr "Remover objetos extra que ya est찼n en archivos empaquetados"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-read-tree[1]"
msgstr "linkgit:git-read-tree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:42
-#, fuzzy
+#, fuzzy, priority:100
msgid "Reads tree information into the index."
msgstr "Lee informaci처n del 찼bol en el 챠ndice"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-symbolic-ref[1]"
msgstr "linkgit:git-symbolic-ref[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:45
-#, fuzzy
+#, fuzzy, priority:100
msgid "Read, modify and delete symbolic refs."
msgstr "Lee, modifica y borra referencias simb처licas"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-unpack-objects[1]"
msgstr "linkgit:git-unpack-objects[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:48
-#, fuzzy
+#, fuzzy, priority:100
msgid "Unpack objects from a packed archive."
msgstr "Desempaqueta objetos de un archivo empaquetado"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:49
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-index[1]"
msgstr "linkgit:git-update-index[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:51
-#, fuzzy
+#, fuzzy, priority:100
msgid "Register file contents in the working tree to the index."
msgstr "Registra contenidos de archivos en el 찼rbol de trabajo al 챠ndice"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:52
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-ref[1]"
msgstr "linkgit:git-update-ref[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:54
-#, fuzzy
+#, fuzzy, priority:100
msgid "Update the object name stored in a ref safely."
-msgstr ""
-"Actualiza el nombre del objeto almacenado en una referencia de forma segura"
+msgstr "Actualiza el nombre del objeto almacenado en una referencia de forma segura"
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
-#, no-wrap
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:57
-#, fuzzy
+#, fuzzy, priority:100
msgid "Create a tree object from the current index."
msgstr "Crea un objeto 찼rbol del 챠ndice actual"
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-attr[1]"
msgstr "linkgit:git-check-attr[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "Display gitattributes information."
msgstr "Mostrar informaci처n de gitattributes"
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-ignore[1]"
msgstr "linkgit:git-check-ignore[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Debug gitignore / exclude files."
msgstr "Debug a gitignore / excluir archivos"
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-mailmap[1]"
msgstr "linkgit:git-check-mailmap[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show canonical names and email addresses of contacts."
msgstr "Mostrar nombres can처nicos y direcciones de correo de contactos"
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-check-ref-format[1]"
msgstr "linkgit:git-check-ref-format[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "Ensures that a reference name is well formed."
msgstr "Asegura que un nombre de referencia est챕 bien formado"
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-column[1]"
msgstr "linkgit:git-column[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:15
-#, fuzzy
+#, fuzzy, priority:100
msgid "Display data in columns."
msgstr "Mostrar data en columnas"
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential[1]"
msgstr "linkgit:git-credential[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:18
-#, fuzzy
+#, fuzzy, priority:100
msgid "Retrieve and store user credentials."
msgstr "Obtener y guardar credenciales de usuario"
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential-cache[1]"
msgstr "linkgit:git-credential-cache[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:21
-#, fuzzy
+#, fuzzy, priority:100
msgid "Helper to temporarily store passwords in memory."
msgstr "Auxiliar para almacenar temporalmente claves en memoria"
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-credential-store[1]"
msgstr "linkgit:git-credential-store[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:24
-#, fuzzy
+#, fuzzy, priority:100
msgid "Helper to store credentials on disk."
msgstr "Auxiliar para guardar credenciales en disco"
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr "linkgit:git-fmt-merge-msg[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:27
-#, fuzzy
+#, fuzzy, priority:100
msgid "Produce a merge commit message."
msgstr "Produce un mensaje de commit para fusi처n"
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-interpret-trailers[1]"
msgstr "linkgit:git-interpret-trailers[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "Add or parse structured information in commit messages."
msgstr "Agregar o analizar informaci처n estructurada en mensajes de commit"
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mailinfo[1]"
msgstr "linkgit:git-mailinfo[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:33
-#, fuzzy
+#, fuzzy, priority:100
msgid "Extracts patch and authorship from a single e-mail message."
msgstr "Extraer parche y autor챠a de un 첬nico mensaje de e-mail"
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mailsplit[1]"
msgstr "linkgit:git-mailsplit[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:36
-#, fuzzy
+#, fuzzy, priority:100
msgid "Simple UNIX mbox splitter program."
msgstr "Programa divisor de mbox simple de UNIX"
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-one-file[1]"
msgstr "linkgit:git-merge-one-file[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:39
-#, fuzzy
+#, fuzzy, priority:100
msgid "The standard helper program to use with git-merge-index."
msgstr "El programa de ayuda est찼ndar para usar con git-merge-index"
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-patch-id[1]"
msgstr "linkgit:git-patch-id[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:42
-#, fuzzy
+#, fuzzy, priority:100
msgid "Compute unique ID for a patch."
msgstr "Calcular ID 첬nico para un parche"
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-sh-i18n[1]"
msgstr "linkgit:git-sh-i18n[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:45
-#, fuzzy
+#, fuzzy, priority:100
msgid "Git's i18n setup code for shell scripts."
msgstr "El c처digo de configuraci처n i18n de Git para scripts de shell"
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-sh-setup[1]"
msgstr "linkgit:git-sh-setup[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:48
-#, fuzzy
+#, fuzzy, priority:100
msgid "Common Git shell script setup code."
msgstr "C처digo de configuraci처n de script de shell com첬n de Git"
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stripspace[1]"
msgstr "linkgit:git-stripspace[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:51
-#, fuzzy
+#, fuzzy, priority:100
msgid "Remove unnecessary whitespace."
msgstr "Eliminar el espacio en blanco innecesario"
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-fetch[1]"
msgstr "linkgit:git-http-fetch[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "Download from a remote Git repository via HTTP."
msgstr "Descarga de un repositorio Git remoto v챠a HTTP"
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-push[1]"
msgstr "linkgit:git-http-push[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Push objects over HTTP/DAV to another repository."
msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-parse-remote[1]"
msgstr "linkgit:git-parse-remote[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Routines to help parsing remote repository access parameters."
-msgstr ""
-"Rutinas para ayudar a analizar los par찼metros de acceso del repositorio "
-"remoto"
+msgstr "Rutinas para ayudar a analizar los par찼metros de acceso del repositorio remoto"
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-receive-pack[1]"
msgstr "linkgit:git-receive-pack[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "Receive what is pushed into the repository."
msgstr "Recibir lo que es empujado en el respositorio"
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shell[1]"
msgstr "linkgit:git-shell[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:15
-#, fuzzy
+#, fuzzy, priority:100
msgid "Restricted login shell for Git-only SSH access."
msgstr "Shell de inicio de sesi처n restringido para acceso SSH exclusivo de Git"
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-upload-archive[1]"
msgstr "linkgit:git-upload-archive[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:18
-#, fuzzy
+#, fuzzy, priority:100
msgid "Send archive back to git-archive."
msgstr "Enviar archivo a git-archive"
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-upload-pack[1]"
msgstr "linkgit:git-upload-pack[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:21
-#, fuzzy
+#, fuzzy, priority:100
msgid "Send objects packed back to git-fetch-pack."
msgstr "Enviar objetos empaquetados a git-fetch-pack"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-daemon[1]"
msgstr "linkgit:git-daemon[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:3
-#, fuzzy
+#, fuzzy, priority:100
msgid "A really simple server for Git repositories."
msgstr "Un servidor realmente simple para repositorios Git"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fetch-pack[1]"
msgstr "linkgit:git-fetch-pack[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:6
-#, fuzzy
+#, fuzzy, priority:100
msgid "Receive missing objects from another repository."
msgstr "Descarga objetos faltantes de otro repositorio"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-http-backend[1]"
msgstr "linkgit:git-http-backend[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:9
-#, fuzzy
+#, fuzzy, priority:100
msgid "Server side implementation of Git over HTTP."
msgstr "Implementaci처n de lado de servidor de Git por HTTP"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-send-pack[1]"
msgstr "linkgit:git-send-pack[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:12
-#, fuzzy
+#, fuzzy, priority:100
msgid "Push objects over Git protocol to another repository."
msgstr "Empujar objetos por protocolo Git a otro repositorio"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:15
-#, fuzzy
+#, fuzzy, priority:100
msgid "Update auxiliary info file to help dumb servers."
-msgstr ""
-"Actualiza el archivo de informaci처n auxiliar para ayudar a los servidores "
-"dumb"
+msgstr "Actualiza el archivo de informaci처n auxiliar para ayudar a los servidores dumb"
#. type: Title -
#: en/config.txt:2 en/git-worktree.txt:237
-#, no-wrap
+#, no-wrap, priority:240
msgid "CONFIGURATION FILE"
msgstr ""
#. type: Plain text
#: en/config.txt:11
-msgid ""
-"The Git configuration file contains a number of variables that affect the "
-"Git commands' behavior. The files `.git/config` and optionally "
-"`config.worktree` (see `extensions.worktreeConfig` below) in each repository "
-"are used to store the configuration for that repository, and "
-"`$HOME/.gitconfig` is used to store a per-user configuration as fallback "
-"values for the `.git/config` file. The file `/etc/gitconfig` can be used to "
-"store a system-wide default configuration."
+#, priority:100
+msgid "The Git configuration file contains a number of variables that affect the Git commands' behavior. The files `.git/config` and optionally `config.worktree` (see `extensions.worktreeConfig` below) in each repository are used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration."
msgstr ""
#. type: Plain text
#: en/config.txt:20
-msgid ""
-"The configuration variables are used by both the Git plumbing and the "
-"porcelains. The variables are divided into sections, wherein the fully "
-"qualified variable name of the variable itself is the last dot-separated "
-"segment and the section name is everything before the last dot. The variable "
-"names are case-insensitive, allow only alphanumeric characters and `-`, and "
-"must start with an alphabetic character. Some variables may appear multiple "
-"times; we say then that the variable is multivalued."
+#, priority:100
+msgid "The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some variables may appear multiple times; we say then that the variable is multivalued."
msgstr ""
#. type: Title ~
#: en/config.txt:22
-#, no-wrap
+#, no-wrap, priority:100
msgid "Syntax"
msgstr ""
#. type: Plain text
#: en/config.txt:27
-msgid ""
-"The syntax is fairly flexible and permissive; whitespaces are mostly "
-"ignored. The '#' and ';' characters begin comments to the end of line, "
-"blank lines are ignored."
+#, priority:100
+msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The '#' and ';' characters begin comments to the end of line, blank lines are ignored."
msgstr ""
#. type: Plain text
#: en/config.txt:34
-msgid ""
-"The file consists of sections and variables. A section begins with the name "
-"of the section in square brackets and continues until the next section "
-"begins. Section names are case-insensitive. Only alphanumeric characters, "
-"`-` and `.` are allowed in section names. Each variable must belong to some "
-"section, which means that there must be a section header before the first "
-"setting of a variable."
+#, priority:100
+msgid "The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.` are allowed in section names. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable."
msgstr ""
#. type: Plain text
#: en/config.txt:38
-msgid ""
-"Sections can be further divided into subsections. To begin a subsection put "
-"its name in double quotes, separated by space from the section name, in the "
-"section header, like in the example below:"
+#, priority:100
+msgid "Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in the example below:"
msgstr ""
#. type: delimited block -
#: en/config.txt:41
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t[section \"subsection\"]\n"
msgstr ""
#. type: Plain text
#: en/config.txt:52
-msgid ""
-"Subsection names are case sensitive and can contain any characters except "
-"newline and the null byte. Doublequote `\"` and backslash can be included by "
-"escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding "
-"other characters are dropped when reading; for example, `\\t` is read as `t` "
-"and `\\0` is read as `0` Section headers cannot span multiple lines. "
-"Variables may belong directly to a section or to a given subsection. You can "
-"have `[section]` if you have `[section \"subsection\"]`, but you don't need "
-"to."
+#, priority:100
+msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0` Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to."
msgstr ""
#. type: Plain text
#: en/config.txt:57
-msgid ""
-"There is also a deprecated `[section.subsection]` syntax. With this syntax, "
-"the subsection name is converted to lower-case and is also compared case "
-"sensitively. These subsection names follow the same restrictions as section "
-"names."
+#, priority:100
+msgid "There is also a deprecated `[section.subsection]` syntax. With this syntax, the subsection name is converted to lower-case and is also compared case sensitively. These subsection names follow the same restrictions as section names."
msgstr ""
#. type: Plain text
#: en/config.txt:64
-msgid ""
-"All the other lines (and the remainder of the line after the section header) "
-"are recognized as setting variables, in the form 'name = value' (or just "
-"'name', which is a short-hand to say that the variable is the boolean "
-"\"true\"). The variable names are case-insensitive, allow only alphanumeric "
-"characters and `-`, and must start with an alphabetic character."
+#, priority:100
+msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\"). The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character."
msgstr ""
#. type: Plain text
#: en/config.txt:72
-msgid ""
-"A line that defines a value can be continued to the next line by ending it "
-"with a `\\`; the backquote and the end-of-line are stripped. Leading "
-"whitespaces after 'name =', the remainder of the line after the first "
-"comment character '#' or ';', and trailing whitespaces of the line are "
-"discarded unless they are enclosed in double quotes. Internal whitespaces "
-"within the value are retained verbatim."
+#, priority:100
+msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backquote and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim."
msgstr ""
#. type: Plain text
#: en/config.txt:75
-msgid ""
-"Inside double quotes, double quote `\"` and backslash `\\` characters must "
-"be escaped: use `\\\"` for `\"` and `\\\\` for `\\`."
+#, priority:100
+msgid "Inside double quotes, double quote `\"` and backslash `\\` characters must be escaped: use `\\\"` for `\"` and `\\\\` for `\\`."
msgstr ""
#. type: Plain text
#: en/config.txt:80
-msgid ""
-"The following escape sequences (beside `\\\"` and `\\\\`) are recognized: "
-"`\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) "
-"and `\\b` for backspace (BS). Other char escape sequences (including octal "
-"escape sequences) are invalid."
+#, priority:100
+msgid "The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) and `\\b` for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid."
msgstr ""
#. type: Title ~
#: en/config.txt:83
-#, no-wrap
+#, no-wrap, priority:100
msgid "Includes"
msgstr ""
#. type: Plain text
#: en/config.txt:90
-msgid ""
-"The `include` and `includeIf` sections allow you to include config "
-"directives from another source. These sections behave identically to each "
-"other with the exception that `includeIf` sections may be ignored if their "
-"condition does not evaluate to true; see \"Conditional includes\" below."
+#, priority:100
+msgid "The `include` and `includeIf` sections allow you to include config directives from another source. These sections behave identically to each other with the exception that `includeIf` sections may be ignored if their condition does not evaluate to true; see \"Conditional includes\" below."
msgstr ""
#. type: Plain text
#: en/config.txt:95
-msgid ""
-"You can include a config file from another by setting the special "
-"`include.path` (or `includeIf.*.path`) variable to the name of the file to "
-"be included. The variable takes a pathname as its value, and is subject to "
-"tilde expansion. These variables can be given multiple times."
+#, priority:100
+msgid "You can include a config file from another by setting the special `include.path` (or `includeIf.*.path`) variable to the name of the file to be included. The variable takes a pathname as its value, and is subject to tilde expansion. These variables can be given multiple times."
msgstr ""
#. type: Plain text
#: en/config.txt:101
-msgid ""
-"The contents of the included file are inserted immediately, as if they had "
-"been found at the location of the include directive. If the value of the "
-"variable is a relative path, the path is considered to be relative to the "
-"configuration file in which the include directive was found. See below for "
-"examples."
+#, priority:100
+msgid "The contents of the included file are inserted immediately, as if they had been found at the location of the include directive. If the value of the variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was found. See below for examples."
msgstr ""
#. type: Title ~
#: en/config.txt:103
-#, no-wrap
+#, no-wrap, priority:100
msgid "Conditional includes"
msgstr ""
#. type: Plain text
#: en/config.txt:108
-msgid ""
-"You can include a config file from another conditionally by setting a "
-"`includeIf.<condition>.path` variable to the name of the file to be "
-"included."
+#, priority:100
+msgid "You can include a config file from another conditionally by setting a `includeIf.<condition>.path` variable to the name of the file to be included."
msgstr ""
#. type: Plain text
#: en/config.txt:112
-msgid ""
-"The condition starts with a keyword followed by a colon and some data whose "
-"format and meaning depends on the keyword. Supported keywords are:"
+#, priority:100
+msgid "The condition starts with a keyword followed by a colon and some data whose format and meaning depends on the keyword. Supported keywords are:"
msgstr ""
#. type: Labeled list
#: en/config.txt:113
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`gitdir`"
msgstr "`gitdir`"
#. type: Plain text
#: en/config.txt:118
-msgid ""
-"The data that follows the keyword `gitdir:` is used as a glob pattern. If "
-"the location of the .git directory matches the pattern, the include "
-"condition is met."
+#, priority:100
+msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If the location of the .git directory matches the pattern, the include condition is met."
msgstr ""
#. type: Plain text
#: en/config.txt:123
-msgid ""
-"The .git location may be auto-discovered, or come from `$GIT_DIR` "
-"environment variable. If the repository is auto discovered via a .git file "
-"(e.g. from submodules, or a linked worktree), the .git location would be the "
-"final location where the .git directory is, not where the"
+#, priority:100
+msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the"
msgstr ""
#. type: Block title
#: en/config.txt:123
-#, no-wrap
+#, no-wrap, priority:100
msgid "git file is."
msgstr ""
#. type: Plain text
#: en/config.txt:128
-msgid ""
-"The pattern can contain standard globbing wildcards and two additional ones, "
-"`**/` and `/**`, that can match multiple path components. Please refer to "
-"linkgit:gitignore[5] for details. For convenience:"
+#, priority:100
+msgid "The pattern can contain standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. Please refer to linkgit:gitignore[5] for details. For convenience:"
msgstr ""
#. type: Plain text
#: en/config.txt:131
-msgid ""
-"If the pattern starts with `~/`, `~` will be substituted with the content of "
-"the environment variable `HOME`."
+#, priority:100
+msgid "If the pattern starts with `~/`, `~` will be substituted with the content of the environment variable `HOME`."
msgstr ""
#. type: Plain text
#: en/config.txt:134
-msgid ""
-"If the pattern starts with `./`, it is replaced with the directory "
-"containing the current config file."
+#, priority:100
+msgid "If the pattern starts with `./`, it is replaced with the directory containing the current config file."
msgstr ""
#. type: Plain text
#: en/config.txt:138
-msgid ""
-"If the pattern does not start with either `~/`, `./` or `/`, `**/` will be "
-"automatically prepended. For example, the pattern `foo/bar` becomes "
-"`**/foo/bar` and would match `/any/path/to/foo/bar`."
+#, priority:100
+msgid "If the pattern does not start with either `~/`, `./` or `/`, `**/` will be automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/bar` and would match `/any/path/to/foo/bar`."
msgstr ""
#. type: Plain text
#: en/config.txt:142
-msgid ""
-"If the pattern ends with `/`, `**` will be automatically added. For example, "
-"the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and "
-"everything inside, recursively."
+#, priority:100
+msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and everything inside, recursively."
msgstr ""
#. type: Labeled list
#: en/config.txt:143
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "`gitdir/i`"
msgstr "`gitdir`"
#. type: Plain text
#: en/config.txt:146
-msgid ""
-"This is the same as `gitdir` except that matching is done case-insensitively "
-"(e.g. on case-insensitive file systems)"
+#, priority:100
+msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file systems)"
msgstr ""
#. type: Labeled list
#: en/config.txt:147
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`onbranch`"
msgstr "`onbranch`"
#. type: Plain text
#: en/config.txt:154
-msgid ""
-"The data that follows the keyword `onbranch:` is taken to be a pattern with "
-"standard globbing wildcards and two additional ones, `**/` and `/**`, that "
-"can match multiple path components. If we are in a worktree where the name "
-"of the branch that is currently checked out matches the pattern, the include "
-"condition is met."
+#, priority:100
+msgid "The data that follows the keyword `onbranch:` is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met."
msgstr ""
#. type: Plain text
#: en/config.txt:160
-msgid ""
-"If the pattern ends with `/`, `**` will be automatically added. For example, "
-"the pattern `foo/` becomes `foo/**`. In other words, it matches all branches "
-"that begin with `foo/`. This is useful if your branches are organized "
-"hierarchically and you would like to apply a configuration to all the "
-"branches in that hierarchy."
+#, priority:100
+msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches all branches that begin with `foo/`. This is useful if your branches are organized hierarchically and you would like to apply a configuration to all the branches in that hierarchy."
msgstr ""
#. type: Plain text
#: en/config.txt:162
+#, priority:100
msgid "A few more notes on matching via `gitdir` and `gitdir/i`:"
msgstr ""
#. type: Plain text
#: en/config.txt:164
+#, priority:100
msgid "Symlinks in `$GIT_DIR` are not resolved before matching."
msgstr ""
#. type: Plain text
#: en/config.txt:169
-msgid ""
-"Both the symlink & realpath versions of paths will be matched outside of "
-"`$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both "
-"`gitdir:~/git` and `gitdir:/mnt/storage/git` will match."
+#, priority:100
+msgid "Both the symlink & realpath versions of paths will be matched outside of `$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both `gitdir:~/git` and `gitdir:/mnt/storage/git` will match."
msgstr ""
#. type: Plain text
#: en/config.txt:174
-msgid ""
-"This was not the case in the initial release of this feature in v2.13.0, "
-"which only matched the realpath version. Configuration that wants to be "
-"compatible with the initial release of this feature needs to either specify "
-"only the realpath version, or both versions."
+#, priority:100
+msgid "This was not the case in the initial release of this feature in v2.13.0, which only matched the realpath version. Configuration that wants to be compatible with the initial release of this feature needs to either specify only the realpath version, or both versions."
msgstr ""
#. type: Plain text
#: en/config.txt:177
-msgid ""
-"Note that \"../\" is not special and will match literally, which is unlikely "
-"what you want."
+#, priority:100
+msgid "Note that \"../\" is not special and will match literally, which is unlikely what you want."
msgstr ""
#. type: Title ~
#: en/config.txt:179 en/git-rev-parse.txt:367 en/git-rev-parse.txt:423
-#, no-wrap
+#, no-wrap, priority:100
msgid "Example"
msgstr ""
#. type: delimited block -
#: en/config.txt:186
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"# Core variables\n"
"[core]\n"
@@ -2575,7 +2272,7 @@ msgstr ""
#. type: delimited block -
#: en/config.txt:191
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"# Our diff algorithm\n"
"[diff]\n"
@@ -2585,7 +2282,7 @@ msgstr ""
#. type: delimited block -
#: en/config.txt:195
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[branch \"devel\"]\n"
"\tremote = origin\n"
@@ -2594,7 +2291,7 @@ msgstr ""
#. type: delimited block -
#: en/config.txt:200
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"# Proxy settings\n"
"[core]\n"
@@ -2604,7 +2301,7 @@ msgstr ""
#. type: delimited block -
#: en/config.txt:205
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[include]\n"
"\tpath = /path/to/foo.inc ; include by absolute path\n"
@@ -2614,7 +2311,7 @@ msgstr ""
#. type: delimited block -
#: en/config.txt:209
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"; include if $GIT_DIR is /path/to/foo/.git\n"
"[includeIf \"gitdir:/path/to/foo/.git\"]\n"
@@ -2623,7 +2320,7 @@ msgstr ""
#. type: delimited block -
#: en/config.txt:213
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"; include for all repositories inside /path/to/group\n"
"[includeIf \"gitdir:/path/to/group/\"]\n"
@@ -2632,7 +2329,7 @@ msgstr ""
#. type: delimited block -
#: en/config.txt:217
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"; include for all repositories inside $HOME/to/group\n"
"[includeIf \"gitdir:~/to/group/\"]\n"
@@ -2641,7 +2338,7 @@ msgstr ""
#. type: delimited block -
#: en/config.txt:223
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"; relative paths are always relative to the including\n"
"; file (if the condition is true); their location is not\n"
@@ -2652,7 +2349,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:229
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
"\t; currently checked out\n"
@@ -2662,45 +2359,43 @@ msgstr ""
#. type: Title ~
#: en/config.txt:231
-#, no-wrap
+#, no-wrap, priority:100
msgid "Values"
msgstr ""
#. type: Plain text
#: en/config.txt:236
-msgid ""
-"Values of many variables are treated as a simple string, but there are "
-"variables that take values of specific types and there are rules as to how "
-"to spell them."
+#, priority:100
+msgid "Values of many variables are treated as a simple string, but there are variables that take values of specific types and there are rules as to how to spell them."
msgstr ""
#. type: Labeled list
#: en/config.txt:237
-#, no-wrap
+#, no-wrap, priority:100
msgid "boolean"
msgstr ""
#. type: Plain text
#: en/config.txt:242
-msgid ""
-"When a variable is said to take a boolean value, many synonyms are accepted "
-"for 'true' and 'false'; these are all case-insensitive."
+#, priority:100
+msgid "When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive."
msgstr ""
#. type: Labeled list
#: en/config.txt:243
-#, no-wrap
+#, no-wrap, priority:100
msgid "true"
msgstr ""
#. type: Plain text
#: en/config.txt:244
+#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""
#. type: Plain text
#: en/config.txt:246
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"and `1`. Also, a variable defined without `= <value>`\n"
"is taken as true.\n"
@@ -2708,562 +2403,463 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:247
-#, no-wrap
+#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
#: en/config.txt:248
+#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
#: en/config.txt:249
-#, no-wrap
+#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
#: en/config.txt:253
-msgid ""
-"When converting a value to its canonical form using the `--type=bool` type "
-"specifier, 'git config' will ensure that the output is \"true\" or \"false\" "
-"(spelled in lowercase)."
+#, priority:100
+msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)."
msgstr ""
#. type: Labeled list
#: en/config.txt:254
-#, no-wrap
+#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
#: en/config.txt:258
-msgid ""
-"The value for many variables that specify various sizes can be suffixed with "
-"`k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
+#, ignore-ellipsis, priority:100
+msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
msgstr ""
#. type: Labeled list
#: en/config.txt:259 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "color"
msgstr "color"
#. type: Plain text
#: en/config.txt:263
-msgid ""
-"The value for a variable that takes a color is a list of colors (at most "
-"two, one for foreground and one for background) and attributes (as many as "
-"you want), separated by spaces."
+#, priority:100
+msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces."
msgstr ""
#. type: Plain text
-#: en/config.txt:267
-msgid ""
-"The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, "
-"`blue`, `magenta`, `cyan` and `white`. The first color given is the "
-"foreground; the second is the background."
+#: en/config.txt:269
+#, priority:100
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
-msgid ""
-"Colors may also be given as numbers between 0 and 255; these use ANSI "
-"256-color mode (but note that not all terminals may support this). If your "
-"terminal supports it, you may also specify 24-bit RGB values as hex, like "
-"`#ff0ab3`."
+#: en/config.txt:274
+#, priority:100
+msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
-msgid ""
-"The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, "
-"`italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The "
-"position of any attributes with respect to the colors (before, after, or in "
-"between), doesn't matter. Specific attributes may be turned off by prefixing "
-"them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
+#: en/config.txt:281
+#, priority:100
+msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
-msgid ""
-"An empty color string produces no color effect at all. This can be used to "
-"avoid coloring specific elements without disabling color entirely."
+#: en/config.txt:284
+#, priority:100
+msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
-msgid ""
-"For git's pre-defined color slots, the attributes are meant to be reset at "
-"the beginning of each item in the colored output. So setting "
-"`color.decorate.branch` to `black` will paint that branch name in a plain "
-"`black`, even if the previous thing on the same output line (e.g. opening "
-"parenthesis before the list of branch names in `log --decorate` output) is "
-"set to be painted with `bold` or some other attribute. However, custom log "
-"formats may do more complicated and layered coloring, and the negated forms "
-"may be useful there."
+#: en/config.txt:293
+#, priority:100
+msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
-#, no-wrap
+#: en/config.txt:294
+#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
-msgid ""
-"A variable that takes a pathname value can be given a string that begins "
-"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such "
-"a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the "
-"specified user's home directory."
+#: en/config.txt:300
+#, priority:100
+msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
-#, no-wrap
+#: en/config.txt:303 en/git-imap-send.txt:58
+#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
-msgid ""
-"Note that this list is non-comprehensive and not necessarily complete. For "
-"command-specific variables, you will find a more detailed description in the "
-"appropriate manual page."
+#: en/config.txt:308
+#, priority:100
+msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
-msgid ""
-"Other git-related tools may and do use their own variables. When inventing "
-"new variables for use in your own tool, make sure their names do not "
-"conflict with those that are used by Git itself and other popular tools, and "
-"describe them in your documentation."
+#: en/config.txt:313
+#, priority:100
+msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.conflictStyle"
msgstr "merge.conflictStyle"
#. type: Plain text
#: en/config/merge.txt:8
-msgid ""
-"Specify the style in which conflicted hunks are written out to working tree "
-"files upon merge. The default is \"merge\", which shows a `<<<<<<<` "
-"conflict marker, changes made by one side, a `=======` marker, changes made "
-"by the other side, and then a `>>>>>>>` marker. An alternate style, "
-"\"diff3\", adds a `|||||||` marker and the original text before the "
-"`=======` marker."
+#, priority:240
+msgid "Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is \"merge\", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, \"diff3\", adds a `|||||||` marker and the original text before the `=======` marker."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:9
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.defaultToUpstream"
msgstr "merge.defaultToUpstream"
#. type: Plain text
#: en/config/merge.txt:18
-msgid ""
-"If merge is called without any commit argument, merge the upstream branches "
-"configured for the current branch by using their last observed values stored "
-"in their remote-tracking branches. The values of the `branch.<current "
-"branch>.merge` that name the branches at the remote named by "
-"`branch.<current branch>.remote` are consulted, and then they are mapped via "
-"`remote.<remote>.fetch` to their corresponding remote-tracking branches, and "
-"the tips of these tracking branches are merged."
+#, priority:240
+msgid "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.ff"
msgstr "merge.ff"
#. type: Plain text
#: en/config/merge.txt:28
-msgid ""
-"By default, Git does not create an extra merge commit when merging a commit "
-"that is a descendant of the current commit. Instead, the tip of the current "
-"branch is fast-forwarded. When set to `false`, this variable tells Git to "
-"create an extra merge commit in such a case (equivalent to giving the "
-"`--no-ff` option from the command line). When set to `only`, only such "
-"fast-forward merges are allowed (equivalent to giving the `--ff-only` option "
-"from the command line)."
+#, priority:240
+msgid "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:29
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.verifySignatures"
msgstr "merge.verifySignatures"
#. type: Plain text
#: en/config/merge.txt:32
-msgid ""
-"If true, this is equivalent to the --verify-signatures command line "
-"option. See linkgit:git-merge[1] for details."
+#, priority:240
+msgid "If true, this is equivalent to the --verify-signatures command line option. See linkgit:git-merge[1] for details."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:35
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.renameLimit"
msgstr "merge.renameLimit"
#. type: Plain text
#: en/config/merge.txt:40
-msgid ""
-"The number of files to consider when performing rename detection during a "
-"merge; if not specified, defaults to the value of diff.renameLimit. This "
-"setting has no effect if rename detection is turned off."
+#, priority:240
+msgid "The number of files to consider when performing rename detection during a merge; if not specified, defaults to the value of diff.renameLimit. This setting has no effect if rename detection is turned off."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:41
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.renames"
msgstr "merge.renames"
#. type: Plain text
#: en/config/merge.txt:45
-msgid ""
-"Whether Git detects renames. If set to \"false\", rename detection is "
-"disabled. If set to \"true\", basic rename detection is enabled. Defaults "
-"to the value of diff.renames."
+#, priority:240
+msgid "Whether Git detects renames. If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled. Defaults to the value of diff.renames."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:46
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.directoryRenames"
msgstr "merge.directoryRenames"
#. type: Plain text
#: en/config/merge.txt:58
-msgid ""
-"Whether Git detects directory renames, affecting what happens at merge time "
-"to new files added to a directory on one side of history when that directory "
-"was renamed on the other side of history. If merge.directoryRenames is set "
-"to \"false\", directory rename detection is disabled, meaning that such new "
-"files will be left behind in the old directory. If set to \"true\", "
-"directory rename detection is enabled, meaning that such new files will be "
-"moved into the new directory. If set to \"conflict\", a conflict will be "
-"reported for such paths. If merge.renames is false, merge.directoryRenames "
-"is ignored and treated as false. Defaults to \"conflict\"."
+#, priority:240
+msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to \"conflict\", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to \"conflict\"."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:59
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.renormalize"
msgstr "merge.renormalize"
#. type: Plain text
#: en/config/merge.txt:68
-msgid ""
-"Tell Git that canonical representation of files in the repository has "
-"changed over time (e.g. earlier commits record text files with CRLF line "
-"endings, but recent ones use LF line endings). In such a repository, Git "
-"can convert the data recorded in commits to a canonical form before "
-"performing a merge to reduce unnecessary conflicts. For more information, "
-"see section \"Merging branches with differing checkin/checkout attributes\" "
-"in linkgit:gitattributes[5]."
+#, priority:240
+msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:69
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.stat"
msgstr "merge.stat"
#. type: Plain text
#: en/config/merge.txt:72
-msgid ""
-"Whether to print the diffstat between ORIG_HEAD and the merge result at the "
-"end of the merge. True by default."
+#, priority:240
+msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:73
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.tool"
msgstr "merge.tool"
#. type: Plain text
#: en/config/merge.txt:78
-msgid ""
-"Controls which merge tool is used by linkgit:git-mergetool[1]. The list "
-"below shows the valid built-in values. Any other value is treated as a "
-"custom merge tool and requires that a corresponding mergetool.<tool>.cmd "
-"variable is defined."
+#, priority:240
+msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:79
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.guitool"
msgstr "merge.guitool"
#. type: Plain text
#: en/config/merge.txt:84
-msgid ""
-"Controls which merge tool is used by linkgit:git-mergetool[1] when the "
-"-g/--gui flag is specified. The list below shows the valid built-in values. "
-"Any other value is treated as a custom merge tool and requires that a "
-"corresponding mergetool.<guitool>.cmd variable is defined."
+#, priority:240
+msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:87
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.verbosity"
msgstr "merge.verbosity"
#. type: Plain text
#: en/config/merge.txt:94
-msgid ""
-"Controls the amount of output shown by the recursive merge strategy. Level "
-"0 outputs nothing except a final error message if conflicts were "
-"detected. Level 1 outputs only conflicts, 2 outputs conflicts and file "
-"changes. Level 5 and above outputs debugging information. The default is "
-"level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment "
-"variable."
+#, priority:240
+msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:95
-#, no-wrap
+#, no-wrap, priority:240
msgid "merge.<driver>.name"
msgstr ""
#. type: Plain text
#: en/config/merge.txt:98
-msgid ""
-"Defines a human-readable name for a custom low-level merge driver. See "
-"linkgit:gitattributes[5] for details."
+#, priority:240
+msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:99
-#, no-wrap
+#, no-wrap, priority:240
msgid "merge.<driver>.driver"
msgstr ""
#. type: Plain text
#: en/config/merge.txt:102
-msgid ""
-"Defines the command that implements a custom low-level merge driver. See "
-"linkgit:gitattributes[5] for details."
+#, priority:240
+msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
#: en/config/merge.txt:103
-#, no-wrap
+#, no-wrap, priority:240
msgid "merge.<driver>.recursive"
msgstr ""
#. type: Plain text
#: en/config/merge.txt:106
-msgid ""
-"Names a low-level merge driver to be used when performing an internal merge "
-"between common ancestors. See linkgit:gitattributes[5] for details."
+#, priority:240
+msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.branchdesc"
msgstr "merge.branchdesc"
#. type: Plain text
#: en/config/fmt-merge-msg.txt:5
-msgid ""
-"In addition to branch names, populate the log message with the branch "
-"description text associated with them. Defaults to false."
+#, priority:240
+msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false."
msgstr ""
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:6
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "merge.log"
msgstr "merge.log"
#. type: Plain text
#: en/config/fmt-merge-msg.txt:10
-msgid ""
-"In addition to branch names, populate the log message with at most the "
-"specified number of one-line descriptions from the actual commits that are "
-"being merged. Defaults to false, and true is a synonym for 20."
+#, priority:240
+msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20."
msgstr ""
#. type: Title -
#: en/date-formats.txt:2
-#, no-wrap
+#, no-wrap, priority:280
msgid "DATE FORMATS"
msgstr ""
#. type: Plain text
#: en/date-formats.txt:5
+#, priority:280
msgid "The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables"
msgstr ""
#. type: Plain text
#: en/date-formats.txt:7
+#, priority:280
msgid "and the `--date` option"
msgstr ""
#. type: Plain text
#: en/date-formats.txt:9
+#, priority:280
msgid "support the following date formats:"
msgstr ""
#. type: Labeled list
#: en/date-formats.txt:10
-#, no-wrap
+#, no-wrap, priority:280
msgid "Git internal format"
msgstr ""
#. type: Plain text
#: en/date-formats.txt:15
-msgid ""
-"It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the "
-"number of seconds since the UNIX epoch. `<time zone offset>` is a positive "
-"or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) "
-"is `+0100`."
+#, priority:280
+msgid "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the number of seconds since the UNIX epoch. `<time zone offset>` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`."
msgstr ""
#. type: Labeled list
#: en/date-formats.txt:16
-#, no-wrap
+#, no-wrap, priority:280
msgid "RFC 2822"
msgstr ""
#. type: Plain text
#: en/date-formats.txt:19
-msgid ""
-"The standard email format as described by RFC 2822, for example `Thu, 07 Apr "
-"2005 22:13:13 +0200`."
+#, priority:280
+msgid "The standard email format as described by RFC 2822, for example `Thu, 07 Apr 2005 22:13:13 +0200`."
msgstr ""
#. type: Labeled list
#: en/date-formats.txt:20
-#, no-wrap
+#, no-wrap, priority:280
msgid "ISO 8601"
msgstr ""
#. type: Plain text
#: en/date-formats.txt:24
-msgid ""
-"Time and date specified by the ISO 8601 standard, for example "
-"`2005-04-07T22:13:13`. The parser accepts a space instead of the `T` "
-"character as well."
+#, priority:280
+msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well."
msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
-msgid ""
-"In addition, the date part is accepted in the following formats: "
-"`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
+#, priority:280
+msgid "In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
msgstr ""
#. type: Title -
#: en/diff-format.txt:2
-#, no-wrap
+#, no-wrap, priority:280
msgid "Raw output format"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:6
-msgid ""
-"The raw output format from \"git-diff-index\", \"git-diff-tree\", "
-"\"git-diff-files\" and \"git diff --raw\" are very similar."
+#, priority:280
+msgid "The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" and \"git diff --raw\" are very similar."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:9
+#, priority:280
msgid "These commands all compare two sets of things; what is compared differs:"
msgstr ""
#. type: Labeled list
#: en/diff-format.txt:10
-#, no-wrap
+#, no-wrap, priority:280
msgid "git-diff-index <tree-ish>"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:12
+#, priority:280
msgid "compares the <tree-ish> and the files on the filesystem."
msgstr ""
#. type: Labeled list
#: en/diff-format.txt:13
-#, no-wrap
+#, no-wrap, priority:280
msgid "git-diff-index --cached <tree-ish>"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:15
+#, priority:280
msgid "compares the <tree-ish> and the index."
msgstr ""
#. type: Labeled list
#: en/diff-format.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:18
+#, priority:280
msgid "compares the trees named by the two arguments."
msgstr ""
#. type: Labeled list
#: en/diff-format.txt:19
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-files [<pattern>...]"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:21
+#, priority:280
msgid "compares the index and the files on the filesystem."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:25
-msgid ""
-"The \"git-diff-tree\" command begins its output by printing the hash of what "
-"is being compared. After that, all the commands print one output line per "
-"changed file."
+#, priority:280
+msgid "The \"git-diff-tree\" command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:27
+#, priority:280
msgid "An output line is formatted this way:"
msgstr ""
#. type: delimited block -
#: en/diff-format.txt:35
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"in-place edit :100644 100644 bcd1234 0123456 M file0\n"
"copy-edit :100644 100644 abcd123 1234567 C68 file1 file2\n"
@@ -3275,207 +2871,223 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:38
+#, priority:280
msgid "That is, from the left to the right:"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:40
+#, priority:280
msgid "a colon."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:41
+#, priority:280
msgid "mode for \"src\"; 000000 if creation or unmerged."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46 en/diff-format.txt:48
+#, priority:280
msgid "a space."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:43
+#, priority:280
msgid "mode for \"dst\"; 000000 if deletion or unmerged."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:45
+#, priority:280
msgid "sha1 for \"src\"; 0\\{40\\} if creation or unmerged."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:47
+#, priority:280
msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:49
+#, priority:280
msgid "status, followed by optional \"score\" number."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:50
+#, priority:280
msgid "a tab or a NUL when `-z` option is used."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:51
+#, priority:280
msgid "path for \"src\""
msgstr ""
#. type: Plain text
#: en/diff-format.txt:52
+#, priority:280
msgid "a tab or a NUL when `-z` option is used; only exists for C or R."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:53
+#, priority:280
msgid "path for \"dst\"; only exists for C or R."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:54
+#, priority:280
msgid "an LF or a NUL when `-z` option is used, to terminate the record."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:56
+#, priority:280
msgid "Possible status letters are:"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:58
+#, priority:280
msgid "A: addition of a file"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:59
+#, priority:280
msgid "C: copy of a file into a new one"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:60
+#, priority:280
msgid "D: deletion of a file"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:61
+#, priority:280
msgid "M: modification of the contents or mode of a file"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:62
+#, priority:280
msgid "R: renaming of a file"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:63
+#, priority:280
msgid "T: change in the type of the file"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:65
+#, priority:280
msgid "U: file is unmerged (you must complete the merge before it can be committed)"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:66
+#, priority:280
msgid "X: \"unknown\" change type (most probably a bug, please report it)"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:71
-msgid ""
-"Status letters C and R are always followed by a score (denoting the "
-"percentage of similarity between the source and target of the move or "
-"copy). Status letter M may be followed by a score (denoting the percentage "
-"of dissimilarity) for file rewrites."
+#, priority:280
+msgid "Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:74
-msgid ""
-"<sha1> is shown as all 0's if a file is new on the filesystem and it is out "
-"of sync with the index."
+#, priority:280
+msgid "<sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index."
msgstr ""
#. type: Labeled list
#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
-#, no-wrap
+#, no-wrap, priority:280
msgid "Example:"
msgstr ""
#. type: delimited block -
#: en/diff-format.txt:79
-#, no-wrap
+#, no-wrap, priority:280
msgid ":100644 100644 5be4a4a 0000000 M file.c\n"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
-msgid ""
-"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
-"explained for the configuration variable `core.quotePath` (see "
-"linkgit:git-config[1]). Using `-z` the filename is output verbatim and the "
-"line is terminated by a NUL byte."
+#, priority:280
+msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). Using `-z` the filename is output verbatim and the line is terminated by a NUL byte."
msgstr ""
#. type: Title -
#: en/diff-format.txt:87
-#, no-wrap
+#, no-wrap, priority:280
msgid "diff format for merges"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:93
-msgid ""
-"\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` "
-"or `--cc` option to generate diff output also for merge commits. The output "
-"differs from the format described above in the following way:"
+#, priority:280
+msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way:"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:95
+#, priority:280
msgid "there is a colon for each parent"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:96
+#, priority:280
msgid "there are more \"src\" modes and \"src\" sha1"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:97
+#, priority:280
msgid "status is concatenated status characters for each parent"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:98
+#, priority:280
msgid "no optional \"score\" number"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:99
+#, priority:280
msgid "tab-separated pathname(s) of the file"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:104
-msgid ""
-"For `-c` and `--cc`, only the destination or final path is shown even if the "
-"file was renamed on any side of history. With `--combined-all-paths`, the "
-"name of the path in each parent is shown followed by the name of the path in "
-"the merge commit."
+#, priority:280
+msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history. With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:106
+#, priority:280
msgid "Examples for `-c` and `--cc` without `--combined-all-paths`:"
msgstr ""
#. type: delimited block -
#: en/diff-format.txt:110
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tbar.sh\n"
@@ -3484,66 +3096,58 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:113
+#, priority:280
msgid "Examples when `--combined-all-paths` added to either `-c` or `--cc`:"
msgstr ""
#. type: delimited block -
#: en/diff-format.txt:118
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n"
-"::100644 100644 100644 e07d6c5 9042e82 ee91881 "
-"RR\tfooey.c\tfuey.c\tphooey.c\n"
+"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey.c\n"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:122
-msgid ""
-"Note that 'combined diff' lists only files which were modified from all "
-"parents."
+#, priority:280
+msgid "Note that 'combined diff' lists only files which were modified from all parents."
msgstr ""
#. type: Title -
#: en/diff-format.txt:128
-#, no-wrap
+#, no-wrap, priority:280
msgid "other diff formats"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:134
-msgid ""
-"The `--summary` option describes newly added, deleted, renamed and copied "
-"files. The `--stat` option adds diffstat(1) graph to the output. These "
-"options can be combined with other options, such as `-p`, and are meant for "
-"human consumption."
+#, priority:280
+msgid "The `--summary` option describes newly added, deleted, renamed and copied files. The `--stat` option adds diffstat(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:139
-msgid ""
-"When showing a change that involves a rename or a copy, `--stat` output "
-"formats the pathnames compactly by combining common prefix and suffix of the "
-"pathnames. For example, a change that moves `arch/i386/Makefile` to "
-"`arch/x86/Makefile` while modifying 4 lines will be shown like this:"
+#, priority:280
+msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:"
msgstr ""
#. type: delimited block -
#: en/diff-format.txt:142
-#, no-wrap
+#, no-wrap, priority:280
msgid "arch/{i386 => x86}/Makefile | 4 +--\n"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:147
-msgid ""
-"The `--numstat` option gives the diffstat(1) information but is designed for "
-"easier machine consumption. An entry in `--numstat` output looks like this:"
+#, priority:280
+msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption. An entry in `--numstat` output looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-format.txt:151
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"1\t2\tREADME\n"
"3\t1\tarch/{i386 => x86}/Makefile\n"
@@ -3551,42 +3155,49 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:154
+#, priority:280
msgid "That is, from left to right:"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:156 en/diff-format.txt:172
+#, priority:280
msgid "the number of added lines;"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173 en/diff-format.txt:175
+#, priority:280
msgid "a tab;"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:158 en/diff-format.txt:174
+#, priority:280
msgid "the number of deleted lines;"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:160
+#, priority:280
msgid "pathname (possibly with rename/copy information);"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:161
+#, priority:280
msgid "a newline."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:163
+#, priority:280
msgid "When `-z` output option is in effect, the output is formatted this way:"
msgstr ""
#. type: delimited block -
#: en/diff-format.txt:167
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"1\t2\tREADME NUL\n"
"3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"
@@ -3594,97 +3205,91 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:170
+#, priority:280
msgid "That is:"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:176 en/diff-format.txt:178
+#, priority:280
msgid "a NUL (only exists if renamed/copied);"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:177
+#, priority:280
msgid "pathname in preimage;"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:179
+#, priority:280
msgid "pathname in postimage (only exists if renamed/copied);"
msgstr ""
#. type: Plain text
#: en/diff-format.txt:180
+#, priority:280
msgid "a NUL."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:185
-msgid ""
-"The extra `NUL` before the preimage path in renamed case is to allow scripts "
-"that read the output to tell if the current record being read is a "
-"single-path record or a rename/copy record without reading ahead. After "
-"reading added and deleted lines, reading up to `NUL` would yield the "
-"pathname, but if that is `NUL`, the record will show two paths."
+#, priority:280
+msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths."
msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap
+#, no-wrap, priority:260
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:14
-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."
+#, priority:260
+msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:17
-msgid ""
-"What the -p option produces is slightly different from the traditional diff "
-"format:"
+#, priority:260
+msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:19
+#, priority:260
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:21
-#, no-wrap
+#, no-wrap, priority:260
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:25
-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."
+#, priority:260
+msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:29
-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."
+#, priority:260
+msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:31
+#, priority:260
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:43
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3701,53 +3306,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:46
-msgid ""
-"File modes are printed as 6-digit octal numbers including the file type and "
-"file permission bits."
+#, priority:260
+msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:48
+#, priority:260
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:55
-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."
+#, priority:260
+msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:59
-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."
+#, priority:260
+msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:63
-msgid ""
-"Pathnames with \"unusual\" characters are quoted as explained for the "
-"configuration variable `core.quotePath` (see linkgit:git-config[1])."
+#, priority:260
+msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:68
-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:"
+#, priority:260
+msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:75
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3759,28 +3354,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:78
-#, no-wrap
+#, no-wrap, priority:260
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:86
-msgid ""
-"Any diff-generating command can take the `-c` or `--cc` option to produce a "
-"'combined diff' when showing a merge. This is the default format when "
-"showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also "
-"that you can give the `-m` option to any of these commands to force "
-"generation of diffs with individual parents of a merge."
+#, priority:260
+msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:88
+#, priority:260
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:97
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3793,7 +3385,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:107
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3808,7 +3400,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:117
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3823,38 +3415,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:121
-msgid ""
-"It is preceded with a \"git diff\" header, that looks like this (when the "
-"`-c` option is used):"
+#, priority:260
+msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:123
-#, no-wrap
+#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:125
+#, priority:260
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:127
-#, no-wrap
+#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:130
-msgid ""
-"It is followed by one or more extended header lines (this example shows a "
-"merge with two parents):"
+#, priority:260
+msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:135
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3864,248 +3455,217 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:141
-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."
+#, priority:260
+msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:143
+#, priority:260
msgid "It is followed by two-line from-file/to-file header"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:145 en/diff-generate-patch.txt:156 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158
+#, priority:260
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:159
+#, priority:260
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:150
-msgid ""
-"Similar to two-line header for traditional 'unified' diff format, "
-"`/dev/null` is used to signal created or deleted files."
+#, priority:260
+msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:154
-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"
+#, priority:260
+msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:163
-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."
+#, priority:260
+msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:169
-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:"
+#, priority:260
+msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:171
-#, no-wrap
+#, no-wrap, priority:260
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:174
-msgid ""
-"There are (number of parents + 1) `@` characters in the chunk header for "
-"combined diff format."
+#, priority:260
+msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:183
-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."
+#, ignore-ellipsis, priority:260
+msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:189
-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)."
+#, priority:260
+msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:195
-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 `+`)."
+#, priority:260
+msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:201
-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\")."
+#, priority:260
+msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
-#, no-wrap
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
#. type: Plain text
#: en/diff-options.txt:19
+#, priority:280
msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
-#, no-wrap
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
-#, no-wrap
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
#. type: Plain text
#: en/diff-options.txt:26
+#, priority:280
msgid "Generate patch (see section on generating patches)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:28 en/diff-options.txt:60
-#, no-wrap
+#, no-wrap, priority:280
msgid "\tThis is the default.\n"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:66 en/git-commit.txt:166 en/git-diff-tree.txt:72 en/git-format-patch.txt:119 en/git-ls-files.txt:59 en/git-revert.txt:97 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "-s"
msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-patch"
msgstr "--no-patch"
#. type: Plain text
#: en/diff-options.txt:34
-msgid ""
-"Suppress diff output. Useful for commands like `git show` that show the "
-"patch by default, or to cancel the effect of `--patch`."
+#, priority:280
+msgid "Suppress diff output. Useful for commands like `git show` that show the patch by default, or to cancel the effect of `--patch`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:36
-#, no-wrap
+#, no-wrap, priority:280
msgid "-U<n>"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:37
-#, no-wrap
+#, no-wrap, priority:280
msgid "--unified=<n>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:40
-msgid ""
-"Generate diffs with <n> lines of context instead of the usual three. Implies "
-"`--patch`."
+#, priority:280
+msgid "Generate diffs with <n> lines of context instead of the usual three. Implies `--patch`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:42
-#, no-wrap
+#, no-wrap, priority:280
msgid "\tImplies `-p`.\n"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:44 en/git-archive.txt:55
-#, no-wrap
+#, no-wrap, priority:280
msgid "--output=<file>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:46
+#, priority:280
msgid "Output to a specific file instead of stdout."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:47
-#, no-wrap
+#, no-wrap, priority:280
msgid "--output-indicator-new=<char>"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:48
-#, no-wrap
+#, no-wrap, priority:280
msgid "--output-indicator-old=<char>"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:49
-#, no-wrap
+#, no-wrap, priority:280
msgid "--output-indicator-context=<char>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:53
-msgid ""
-"Specify the character used to indicate new, old or context lines in the "
-"generated patch. Normally they are '+', '-' and ' ' respectively."
+#, priority:280
+msgid "Specify the character used to indicate new, old or context lines in the generated patch. Normally they are '+', '-' and ' ' respectively."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--raw"
msgstr "--raw"
#. type: Plain text
#: en/diff-options.txt:58
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:280
msgid "\tGenerate the diff in raw format.\n"
msgstr "genera el diff en formato raw"
#. type: Plain text
#: en/diff-options.txt:68
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"\tFor each commit, show a summary of changes using the raw diff\n"
"\tformat. See the \"RAW OUTPUT FORMAT\" section of\n"
@@ -4116,433 +3676,367 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:72
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
#. type: Plain text
#: en/diff-options.txt:74
-#, fuzzy
+#, fuzzy, priority:280
msgid "Synonym for `-p --raw`."
msgstr "sin처nimo para '-p --stat'"
#. type: Labeled list
#: en/diff-options.txt:76
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--indent-heuristic"
msgstr "--indent-heuristic"
#. type: Plain text
#: en/diff-options.txt:79
-msgid ""
-"Enable the heuristic that shifts diff hunk boundaries to make patches easier "
-"to read. This is the default."
+#, priority:280
+msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:80
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-indent-heuristic"
msgstr "--no-indent-heuristic"
#. type: Plain text
#: en/diff-options.txt:82
+#, priority:280
msgid "Disable the indent heuristic."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--minimal"
msgstr "--minimal"
#. type: Plain text
#: en/diff-options.txt:86 en/diff-options.txt:112
+#, priority:280
msgid "Spend extra time to make sure the smallest possible diff is produced."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:87
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--patience"
msgstr "--patience"
#. type: Plain text
#: en/diff-options.txt:89
-#, fuzzy
+#, fuzzy, priority:280
msgid "Generate a diff using the \"patience diff\" algorithm."
msgstr "genera un diff usando algoritmo \"patience diff\""
#. type: Labeled list
#: en/diff-options.txt:90
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--histogram"
msgstr "--histogram"
#. type: Plain text
#: en/diff-options.txt:92
-#, fuzzy
+#, fuzzy, priority:280
msgid "Generate a diff using the \"histogram diff\" algorithm."
msgstr "genera un diff usando algoritmo \"histogram diff\""
#. type: Labeled list
#: en/diff-options.txt:93
-#, no-wrap
+#, no-wrap, priority:280
msgid "--anchored=<text>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:95
-#, fuzzy
+#, fuzzy, priority:280
msgid "Generate a diff using the \"anchored diff\" algorithm."
msgstr "genera un diff usando algoritmo \"anchored diff\""
#. type: Plain text
#: en/diff-options.txt:97
+#, priority:280
msgid "This option may be specified more than once."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:102
-msgid ""
-"If a line exists in both the source and destination, exists only once, and "
-"starts with this text, this algorithm attempts to prevent it from appearing "
-"as a deletion or addition in the output. It uses the \"patience diff\" "
-"algorithm internally."
+#, priority:280
+msgid "If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the \"patience diff\" algorithm internally."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:103
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:280
msgid "--diff-algorithm={patience|minimal|histogram|myers}"
msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/diff-options.txt:105
+#, priority:280
msgid "Choose a diff algorithm. The variants are as follows:"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:109
+#, priority:280
msgid "The basic greedy diff algorithm. Currently, this is the default."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:109
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "`minimal`"
msgstr "`minimal`"
#. type: Labeled list
#: en/diff-options.txt:112
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "`patience`"
msgstr "`patience`"
#. type: Plain text
#: en/diff-options.txt:114
+#, priority:280
msgid "Use \"patience diff\" algorithm when generating patches."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:114
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "`histogram`"
msgstr "`histogram`"
#. type: Plain text
#: en/diff-options.txt:117
-msgid ""
-"This algorithm extends the patience algorithm to \"support low-occurrence "
-"common elements\"."
+#, priority:280
+msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:122
-msgid ""
-"For instance, if you configured the `diff.algorithm` variable to a "
-"non-default value and want to use the default one, then you have to use "
-"`--diff-algorithm=default` option."
+#, priority:280
+msgid "For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:123
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
#. type: Plain text
#: en/diff-options.txt:137
-msgid ""
-"Generate a diffstat. By default, as much space as necessary will be used for "
-"the filename part, and the rest for the graph part. Maximum width defaults "
-"to terminal width, or 80 columns if not connected to a terminal, and can be "
-"overridden by `<width>`. The width of the filename part can be limited by "
-"giving another width `<name-width>` after a comma. The width of the graph "
-"part can be limited by using `--stat-graph-width=<width>` (affects all "
-"commands generating a stat graph) or by setting "
-"`diff.statGraphWidth=<width>` (does not affect `git format-patch`). By "
-"giving a third parameter `<count>`, you can limit the output to the first "
-"`<count>` lines, followed by `...` if there are more."
+#, ignore-ellipsis, priority:280
+msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`). By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:140
-msgid ""
-"These parameters can also be set individually with `--stat-width=<width>`, "
-"`--stat-name-width=<name-width>` and `--stat-count=<count>`."
+#, priority:280
+msgid "These parameters can also be set individually with `--stat-width=<width>`, `--stat-name-width=<name-width>` and `--stat-count=<count>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:141
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--compact-summary"
msgstr "--compact-summary"
#. type: Plain text
#: en/diff-options.txt:148
-msgid ""
-"Output a condensed summary of extended header information such as file "
-"creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a "
-"symlink) and mode changes (\"+x\" or \"-x\" for adding or removing "
-"executable bit respectively) in diffstat. The information is put between the "
-"filename part and the graph part. Implies `--stat`."
+#, priority:280
+msgid "Output a condensed summary of extended header information such as file creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a symlink) and mode changes (\"+x\" or \"-x\" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:149 en/git-apply.txt:45
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--numstat"
msgstr "--numstat"
#. type: Plain text
#: en/diff-options.txt:155
-msgid ""
-"Similar to `--stat`, but shows number of added and deleted lines in decimal "
-"notation and pathname without abbreviation, to make it more machine "
-"friendly. For binary files, outputs two `-` instead of saying `0 0`."
+#, priority:280
+msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:156
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--shortstat"
msgstr "--shortstat"
#. type: Plain text
#: en/diff-options.txt:160
-msgid ""
-"Output only the last line of the `--stat` format containing total number of "
-"modified files, as well as number of added and deleted lines."
+#, priority:280
+msgid "Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:161
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "-X[<param1,param2,...>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:162
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat[=<param1,param2,...>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:169
-msgid ""
-"Output the distribution of relative amount of changes for each "
-"sub-directory. The behavior of `--dirstat` can be customized by passing it a "
-"comma separated list of parameters. The defaults are controlled by the "
-"`diff.dirstat` configuration variable (see linkgit:git-config[1]). The "
-"following parameters are available:"
+#, priority:280
+msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:171
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "`changes`"
msgstr "`changes`"
#. type: Plain text
#: en/diff-options.txt:177
-msgid ""
-"Compute the dirstat numbers by counting the lines that have been removed "
-"from the source, or added to the destination. This ignores the amount of "
-"pure code movements within a file. In other words, rearranging lines in a "
-"file is not counted as much as other changes. This is the default behavior "
-"when no parameter is given."
+#, priority:280
+msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "`lines`"
msgstr "`lines`"
#. type: Plain text
#: en/diff-options.txt:185
-msgid ""
-"Compute the dirstat numbers by doing the regular line-based diff analysis, "
-"and summing the removed/added line counts. (For binary files, count 64-byte "
-"chunks instead, since binary files have no natural concept of lines). This "
-"is a more expensive `--dirstat` behavior than the `changes` behavior, but it "
-"does count rearranged lines within a file as much as other changes. The "
-"resulting output is consistent with what you get from the other `--*stat` "
-"options."
+#, priority:280
+msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:185
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "`files`"
msgstr "`files`"
#. type: Plain text
#: en/diff-options.txt:190
-msgid ""
-"Compute the dirstat numbers by counting the number of files changed. Each "
-"changed file counts equally in the dirstat analysis. This is the "
-"computationally cheapest `--dirstat` behavior, since it does not have to "
-"look at the file contents at all."
+#, priority:280
+msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:190
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "`cumulative`"
msgstr "`cumulative`"
#. type: Plain text
#: en/diff-options.txt:195
-msgid ""
-"Count changes in a child directory for the parent directory as well. Note "
-"that when using `cumulative`, the sum of the percentages reported may exceed "
-"100%. The default (non-cumulative) behavior can be specified with the "
-"`noncumulative` parameter."
+#, priority:280
+msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:195 en/git-cherry.txt:39
-#, no-wrap
+#, no-wrap, priority:280
msgid "<limit>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:199
-msgid ""
-"An integer parameter specifies a cut-off percent (3% by default). "
-"Directories contributing less than this percentage of the changes are not "
-"shown in the output."
+#, priority:280
+msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:205
-msgid ""
-"Example: The following will count changed files, while ignoring directories "
-"with less than 10% of the total amount of changed files, and accumulating "
-"child directory counts in the parent directories: "
-"`--dirstat=files,10,cumulative`."
+#, priority:280
+msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:206
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--cumulative"
msgstr "--cumulative"
#. type: Plain text
#: en/diff-options.txt:208
-#, fuzzy
+#, fuzzy, priority:280
msgid "Synonym for --dirstat=cumulative"
msgstr "sin처nimo para --dirstat=cumulative"
#. type: Labeled list
#: en/diff-options.txt:209
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat-by-file[=<param1,param2>...]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:211
-#, fuzzy
+#, fuzzy, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo para --dirstat=archivos,param1,param2..."
#. type: Labeled list
#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
#. type: Plain text
#: en/diff-options.txt:215
-msgid ""
-"Output a condensed summary of extended header information such as creations, "
-"renames and mode changes."
+#, priority:280
+msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:217
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
#. type: Plain text
#: en/diff-options.txt:219
-#, fuzzy
+#, fuzzy, priority:280
msgid "Synonym for `-p --stat`."
msgstr "sin처nimo para '-p --stat'"
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
-#, no-wrap
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
#. type: Plain text
#: en/diff-options.txt:226
-#, no-wrap
+#, no-wrap, priority:280
msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:229
-msgid ""
-"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and "
-"use NULs as output field terminators."
+#, priority:280
+msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:233
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
"\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
@@ -4550,125 +4044,111 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:238 en/git-apply.txt:122
-msgid ""
-"Without this option, pathnames with \"unusual\" characters are quoted as "
-"explained for the configuration variable `core.quotePath` (see "
-"linkgit:git-config[1])."
+#, priority:280
+msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
-#, no-wrap
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
#. type: Plain text
#: en/diff-options.txt:241
-#, fuzzy
+#, fuzzy, priority:280
msgid "Show only names of changed files."
msgstr "mostrar solo nombres de archivos cambiados"
#. type: Labeled list
#: en/diff-options.txt:242 en/git-ls-tree.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--name-status"
msgstr "--name-status"
#. type: Plain text
#: en/diff-options.txt:245
-msgid ""
-"Show only names and status of changed files. See the description of the "
-"`--diff-filter` option on what the status letters mean."
+#, priority:280
+msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:246
-#, no-wrap
+#, no-wrap, priority:280
msgid "--submodule[=<format>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:257
-msgid ""
-"Specify how differences in submodules are shown. When specifying "
-"`--submodule=short` the 'short' format is used. This format just shows the "
-"names of the commits at the beginning and end of the range. When "
-"`--submodule` or `--submodule=log` is specified, the 'log' format is used. "
-"This format lists the commits in the range like linkgit:git-submodule[1] "
-"`summary` does. When `--submodule=diff` is specified, the 'diff' format is "
-"used. This format shows an inline diff of the changes in the submodule "
-"contents between the commit range. Defaults to `diff.submodule` or the "
-"'short' format if the config option is unset."
+#, priority:280
+msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
-#, no-wrap
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
+#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:262
-msgid ""
-"Show colored diff. `--color` (i.e. without '=<when>') is the same as "
-"`--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
+#, priority:280
+msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:265
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"\tIt can be changed by the `color.ui` and `color.diff`\n"
"\tconfiguration settings.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
-#, no-wrap
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
#. type: Plain text
#: en/diff-options.txt:269
+#, priority:280
msgid "Turn off colored diff."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:271
-#, no-wrap
+#, no-wrap, priority:280
msgid "\tThis can be used to override configuration settings.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:273
-#, no-wrap
+#, no-wrap, priority:280
msgid "\tIt is the same as `--color=never`.\n"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:274
-#, no-wrap
+#, no-wrap, priority:280
msgid "--color-moved[=<mode>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:276
-#, fuzzy
+#, fuzzy, priority:280
msgid "Moved lines of code are colored differently."
msgstr "l챠neas movidas de c처digo est찼n coloreadas diferente"
#. type: Plain text
#: en/diff-options.txt:278
-#, no-wrap
+#, no-wrap, priority:280
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:282
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"\tThe <mode> defaults to 'no' if the option is not given\n"
"\tand to 'zebra' if the option with no mode is given.\n"
@@ -4677,497 +4157,409 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "no"
msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
+#, priority:280
msgid "Moved lines are not highlighted."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:212
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"
#. type: Plain text
#: en/diff-options.txt:289
-msgid ""
-"Is a synonym for `zebra`. This may change to a more sensible mode in the "
-"future."
+#, priority:280
+msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "plain"
msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
-msgid ""
-"Any line that is added in one location and was removed in another location "
-"will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' "
-"will be used for removed lines that are added somewhere else in the "
-"diff. This mode picks up any moved line, but it is not very useful in a "
-"review to determine if a block of code was moved without permutation."
+#, priority:280
+msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "blocks"
msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
-msgid ""
-"Blocks of moved text of at least 20 alphanumeric characters are detected "
-"greedily. The detected blocks are painted using either the "
-"'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
+#, priority:280
+msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "zebra"
msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:306
-msgid ""
-"Blocks of moved text are detected as in 'blocks' mode. The blocks are "
-"painted using either the 'color.diff.{old,new}Moved' color or "
-"'color.diff.{old,new}MovedAlternative'. The change between the two colors "
-"indicates that a new block was detected."
+#, priority:280
+msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
-msgid ""
-"Similar to 'zebra', but additional dimming of uninteresting parts of moved "
-"code is performed. The bordering lines of two adjacent blocks are considered "
-"interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated "
-"synonym."
+#, priority:280
+msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:313
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved"
msgstr "--no-color-moved"
#. type: Plain text
#: en/diff-options.txt:316
-msgid ""
-"Turn off move detection. This can be used to override configuration "
-"settings. It is the same as `--color-moved=no`."
+#, priority:280
+msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:317
-#, no-wrap
+#, no-wrap, priority:280
msgid "--color-moved-ws=<modes>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:320
-msgid ""
-"This configures how whitespace is ignored when performing the move detection "
-"for `--color-moved`."
+#, priority:280
+msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:322
-#, no-wrap
+#, no-wrap, priority:280
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:324
-#, no-wrap
+#, no-wrap, priority:280
msgid "\tThese modes can be given as a comma separated list:\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:328
+#, priority:280
msgid "Do not ignore whitespace when performing move detection."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
msgstr "ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:330 en/diff-options.txt:665
-#, fuzzy
+#, fuzzy, priority:280
msgid "Ignore changes in whitespace at EOL."
msgstr "ignorar cambios en espacios en blanco en EOL"
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
msgstr "ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:334 en/diff-options.txt:671
-msgid ""
-"Ignore changes in amount of whitespace. This ignores whitespace at line "
-"end, and considers all other sequences of one or more whitespace characters "
-"to be equivalent."
+#, priority:280
+msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
msgstr "ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:337
-msgid ""
-"Ignore whitespace when comparing lines. This ignores differences even if one "
-"line has whitespace where the other line has none."
+#, priority:280
+msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:337
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
msgstr "allow-indentation-change"
#. type: Plain text
#: en/diff-options.txt:342
-msgid ""
-"Initially ignore any whitespace in the move detection, then group the moved "
-"code blocks only into a block if the change in whitespace is the same per "
-"line. This is incompatible with the other modes."
+#, priority:280
+msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:344
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved-ws"
msgstr "--no-color-moved-ws"
#. type: Plain text
#: en/diff-options.txt:348
-msgid ""
-"Do not ignore whitespace when performing move detection. This can be used to "
-"override configuration settings. It is the same as `--color-moved-ws=no`."
+#, priority:280
+msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:349
-#, no-wrap
+#, no-wrap, priority:280
msgid "--word-diff[=<mode>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:354
-msgid ""
-"Show a word diff, using the <mode> to delimit changed words. By default, "
-"words are delimited by whitespace; see `--word-diff-regex` below. The "
-"<mode> defaults to 'plain', and must be one of:"
+#, priority:280
+msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:358
+#, priority:280
msgid "Highlight changed words using only colors. Implies `--color`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:362
-msgid ""
-"Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape "
-"the delimiters if they appear in the input, so the output may be ambiguous."
+#, priority:280
+msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:362
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "porcelain"
msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
-msgid ""
-"Use a special line-based format intended for script consumption. "
-"Added/removed/unchanged runs are printed in the usual unified diff format, "
-"starting with a `+`/`-`/` ` character at the beginning of the line and "
-"extending to the end of the line. Newlines in the input are represented by "
-"a tilde `~` on a line of its own."
+#, priority:280
+msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:172
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "none"
msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
+#, priority:280
msgid "Disable word diff again."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:375
-msgid ""
-"Note that despite the name of the first mode, color is used to highlight the "
-"changed parts in all modes if enabled."
+#, priority:280
+msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:376
-#, no-wrap
+#, no-wrap, priority:280
msgid "--word-diff-regex=<regex>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:380
-msgid ""
-"Use <regex> to decide what a word is, instead of considering runs of "
-"non-whitespace to be a word. Also implies `--word-diff` unless it was "
-"already enabled."
+#, priority:280
+msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:388
-msgid ""
-"Every non-overlapping match of the <regex> is considered a word. Anything "
-"between these matches is considered whitespace and ignored(!) for the "
-"purposes of finding differences. You may want to append `|[^[:space:]]` to "
-"your regular expression to make sure that it matches all non-whitespace "
-"characters. A match that contains a newline is silently truncated(!) at the "
-"newline."
+#, priority:280
+msgid "Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:391
-msgid ""
-"For example, `--word-diff-regex=.` will treat each character as a word and, "
-"correspondingly, show differences character by character."
+#, priority:280
+msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:396
-msgid ""
-"The regex can also be set via a diff driver or configuration option, see "
-"linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly "
-"overrides any diff driver or configuration setting. Diff drivers override "
-"configuration settings."
+#, priority:280
+msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:397
-#, no-wrap
+#, no-wrap, priority:280
msgid "--color-words[=<regex>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:400
-msgid ""
-"Equivalent to `--word-diff=color` plus (if a regex was specified) "
-"`--word-diff-regex=<regex>`."
+#, priority:280
+msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:402 en/git-status.txt:143
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
#. type: Plain text
#: en/diff-options.txt:405
-msgid ""
-"Turn off rename detection, even when the configuration file gives the "
-"default to do so."
+#, priority:280
+msgid "Turn off rename detection, even when the configuration file gives the default to do so."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:406
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--[no-]rename-empty"
msgstr "--[no-]rename-empty"
#. type: Plain text
#: en/diff-options.txt:408
+#, priority:280
msgid "Whether to use empty blobs as rename source."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:410 en/git-apply.txt:58
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--check"
msgstr "--check"
#. type: Plain text
#: en/diff-options.txt:419
-msgid ""
-"Warn if changes introduce conflict markers or whitespace errors. What are "
-"considered whitespace errors is controlled by `core.whitespace` "
-"configuration. By default, trailing whitespaces (including lines that "
-"consist solely of whitespaces) and a space character that is immediately "
-"followed by a tab character inside the initial indent of the line are "
-"considered whitespace errors. Exits with non-zero status if problems are "
-"found. Not compatible with --exit-code."
+#, priority:280
+msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:420
-#, no-wrap
+#, no-wrap, priority:280
msgid "--ws-error-highlight=<kind>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:429
-msgid ""
-"Highlight whitespace errors in the `context`, `old` or `new` lines of the "
-"diff. Multiple values are separated by comma, `none` resets previous "
-"values, `default` reset the list to `new` and `all` is a shorthand for "
-"`old,new,context`. When this option is not given, and the configuration "
-"variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` "
-"lines are highlighted. The whitespace errors are colored with "
-"`color.diff.whitespace`."
+#, priority:280
+msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:432
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--full-index"
msgstr "--full-index"
#. type: Plain text
#: en/diff-options.txt:436
-msgid ""
-"Instead of the first handful of characters, show the full pre- and "
-"post-image blob object names on the \"index\" line when generating patch "
-"format output."
+#, priority:280
+msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:437 en/git-apply.txt:160
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--binary"
msgstr "--binary"
#. type: Plain text
#: en/diff-options.txt:440
-msgid ""
-"In addition to `--full-index`, output a binary diff that can be applied with "
-"`git-apply`. Implies `--patch`."
+#, priority:280
+msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:441 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
-#, no-wrap
+#, no-wrap, priority:280
msgid "--abbrev[=<n>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:448
-msgid ""
-"Instead of showing the full 40-byte hexadecimal object name in diff-raw "
-"format output and diff-tree header lines, show only a partial prefix. This "
-"is independent of the `--full-index` option above, which controls the "
-"diff-patch output format. Non default number of digits can be specified "
-"with `--abbrev=<n>`."
+#, priority:280
+msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the `--full-index` option above, which controls the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:449
-#, no-wrap
+#, no-wrap, priority:280
msgid "-B[<n>][/<m>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:450
-#, no-wrap
+#, no-wrap, priority:280
msgid "--break-rewrites[=[<n>][/<m>]]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:453
-msgid ""
-"Break complete rewrite changes into pairs of delete and create. This serves "
-"two purposes:"
+#, priority:280
+msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
-msgid ""
-"It affects the way a change that amounts to a total rewrite of a file not as "
-"a series of deletion and insertion mixed together with a very few lines that "
-"happen to match textually as the context, but as a single deletion of "
-"everything old followed by a single insertion of everything new, and the "
-"number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` "
-"specifies that less than 30% of the original should remain in the result for "
-"Git to consider it a total rewrite (i.e. otherwise the resulting patch will "
-"be a series of deletion and insertion mixed together with context lines)."
+#, priority:280
+msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:471
-msgid ""
-"When used with -M, a totally-rewritten file is also considered as the source "
-"of a rename (usually -M only considers a file that disappeared as the source "
-"of a rename), and the number `n` controls this aspect of the -B option "
-"(defaults to 50%). `-B20%` specifies that a change with addition and "
-"deletion compared to 20% or more of the file's size are eligible for being "
-"picked up as a possible source of a rename to another file."
+#, priority:280
+msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:472
-#, no-wrap
+#, no-wrap, priority:280
msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:473 en/git-status.txt:147
-#, no-wrap
+#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:476
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:280
msgid "\tDetect renames.\n"
msgstr "detectar renombrados"
#. type: Plain text
#: en/diff-options.txt:481
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"\tIf generating diffs, detect and report renames for each commit.\n"
"\tFor following files across renames while traversing history, see\n"
@@ -5176,7 +4568,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:491
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"\tIf `n` is specified, it is a threshold on the similarity\n"
"\tindex (i.e. amount of addition/deletions compared to the\n"
@@ -5191,819 +4583,688 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:492
-#, no-wrap
+#, no-wrap, priority:280
msgid "-C[<n>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:493
-#, no-wrap
+#, no-wrap, priority:280
msgid "--find-copies[=<n>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:496
-msgid ""
-"Detect copies as well as renames. See also `--find-copies-harder`. If `n` "
-"is specified, it has the same meaning as for `-M<n>`."
+#, priority:280
+msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:497 en/git-svn.txt:626
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
#. type: Plain text
#: en/diff-options.txt:505
-msgid ""
-"For performance reasons, by default, `-C` option finds copies only if the "
-"original file of the copy was modified in the same changeset. This flag "
-"makes the command inspect unmodified files as candidates for the source of "
-"copy. This is a very expensive operation for large projects, so use it with "
-"caution. Giving more than one `-C` option has the same effect."
+#, priority:280
+msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:506 en/git-branch.txt:103 en/git-http-push.txt:45
-#, no-wrap
+#, no-wrap, priority:280
msgid "-D"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:507
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
#. type: Plain text
#: en/diff-options.txt:515
-msgid ""
-"Omit the preimage for deletes, i.e. print only the header but not the diff "
-"between the preimage and `/dev/null`. The resulting patch is not meant to be "
-"applied with `patch` or `git apply`; this is solely for people who want to "
-"just concentrate on reviewing the text after the change. In addition, the "
-"output obviously lacks enough information to apply such a patch in reverse, "
-"even manually, hence the name of the option."
+#, priority:280
+msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:518
-msgid ""
-"When used together with `-B`, omit also the preimage in the deletion part of "
-"a delete/create pair."
+#, priority:280
+msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:519 en/git-svn.txt:625
-#, no-wrap
+#, no-wrap, priority:280
msgid "-l<num>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:525
-msgid ""
-"The `-M` and `-C` options require O(n^2) processing time where n is the "
-"number of potential rename/copy targets. This option prevents rename/copy "
-"detection from running if the number of rename/copy targets exceeds the "
-"specified number."
+#, priority:280
+msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:527
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:538
-msgid ""
-"Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), "
-"Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, "
-"submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or "
-"have had their pairing Broken (`B`). Any combination of the filter "
-"characters (including none) can be used. When `*` (All-or-none) is added to "
-"the combination, all paths are selected if there is any file that matches "
-"other criteria in the comparison; if there is no file that matches other "
-"criteria, nothing is selected."
+#, ignore-ellipsis, priority:280
+msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:541
-msgid ""
-"Also, these upper-case letters can be downcased to exclude. E.g. "
-"`--diff-filter=ad` excludes added and deleted paths."
+#, priority:280
+msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:547
-msgid ""
-"Note that not all diffs can feature all types. For instance, diffs from the "
-"index to the working tree can never have Added entries (because the set of "
-"paths included in the diff is limited by what is in the index). Similarly, "
-"copied and renamed entries cannot appear if detection for those types is "
-"disabled."
+#, priority:280
+msgid "Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Similarly, copied and renamed entries cannot appear if detection for those types is disabled."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:548
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:280
msgid "-S<string>"
msgstr "<string>"
#. type: Plain text
#: en/diff-options.txt:552
-msgid ""
-"Look for differences that change the number of occurrences of the specified "
-"string (i.e. addition/deletion) in a file. Intended for the scripter's use."
+#, priority:280
+msgid "Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:558
-msgid ""
-"It is useful when you're looking for an exact block of code (like a struct), "
-"and want to know the history of that block since it first came into being: "
-"use the feature iteratively to feed the interesting block in the preimage "
-"back into `-S`, and keep going until you get the very first version of the "
-"block."
+#, priority:280
+msgid "It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:560
+#, priority:280
msgid "Binary files are searched as well."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:561
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:280
msgid "-G<regex>"
msgstr "<regex>"
#. type: Plain text
#: en/diff-options.txt:564
-msgid ""
-"Look for differences whose patch text contains added/removed lines that "
-"match <regex>."
+#, priority:280
+msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:568
-msgid ""
-"To illustrate the difference between `-S<regex> --pickaxe-regex` and "
-"`-G<regex>`, consider a commit with the following diff in the same file:"
+#, priority:280
+msgid "To illustrate the difference between `-S<regex> --pickaxe-regex` and `-G<regex>`, consider a commit with the following diff in the same file:"
msgstr ""
#. type: delimited block -
#: en/diff-options.txt:573
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
-msgid ""
-"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log "
-"-S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
-"occurrences of that string did not change)."
+#, priority:280
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:581
-msgid ""
-"Unless `--text` is supplied patches of binary files without a textconv "
-"filter will be ignored."
+#, priority:280
+msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:584
+#, priority:280
msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:585
-#, no-wrap
+#, no-wrap, priority:280
msgid "--find-object=<object-id>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:590
-msgid ""
-"Look for differences that change the number of occurrences of the specified "
-"object. Similar to `-S`, just the argument is different in that it doesn't "
-"search for a specific string but for a specific object id."
+#, priority:280
+msgid "Look for differences that change the number of occurrences of the specified object. Similar to `-S`, just the argument is different in that it doesn't search for a specific string but for a specific object id."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:593
-msgid ""
-"The object can be a blob or a submodule commit. It implies the `-t` option "
-"in `git-log` to also find trees."
+#, priority:280
+msgid "The object can be a blob or a submodule commit. It implies the `-t` option in `git-log` to also find trees."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:594
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
#. type: Plain text
#: en/diff-options.txt:598
-msgid ""
-"When `-S` or `-G` finds a change, show all the changes in that changeset, "
-"not just the files that contain the change in <string>."
+#, priority:280
+msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:599
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
#. type: Plain text
#: en/diff-options.txt:602
-msgid ""
-"Treat the <string> given to `-S` as an extended POSIX regular expression to "
-"match."
+#, priority:280
+msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:605 en/git-mergetool.txt:95
-#, no-wrap
+#, no-wrap, priority:280
msgid "-O<orderfile>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:610
-msgid ""
-"Control the order in which files appear in the output. This overrides the "
-"`diff.orderFile` configuration variable (see linkgit:git-config[1]). To "
-"cancel `diff.orderFile`, use `-O/dev/null`."
+#, priority:280
+msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:622
-msgid ""
-"The output order is determined by the order of glob patterns in "
-"<orderfile>. All files with pathnames that match the first pattern are "
-"output first, all files with pathnames that match the second pattern (but "
-"not the first) are output next, and so on. All files with pathnames that do "
-"not match any pattern are output last, as if there was an implicit match-all "
-"pattern at the end of the file. If multiple pathnames have the same rank "
-"(they match the same pattern but no earlier patterns), their output order "
-"relative to each other is the normal order."
+#, priority:280
+msgid "The output order is determined by the order of glob patterns in <orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:624
+#, priority:280
msgid "<orderfile> is parsed as follows:"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:628
+#, priority:280
msgid "Blank lines are ignored, so they can be used as separators for readability."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:632
-msgid ""
-"Lines starting with a hash (\"`#`\") are ignored, so they can be used for "
-"comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it "
-"starts with a hash."
+#, priority:280
+msgid "Lines starting with a hash (\"`#`\") are ignored, so they can be used for comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it starts with a hash."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:634
+#, priority:280
msgid "Each other line contains a single pattern."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:641
-msgid ""
-"Patterns have the same syntax and semantics as patterns used for fnmatch(3) "
-"without the FNM_PATHNAME flag, except a pathname also matches a pattern if "
-"removing any number of the final pathname components matches the pattern. "
-"For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and "
-"\"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
+#, priority:280
+msgid "Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:643 en/git-apply.txt:104 en/git-cvsimport.txt:168
-#, no-wrap
+#, no-wrap, priority:280
msgid "-R"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:646
-msgid ""
-"Swap two inputs; that is, show differences from index or on-disk file to "
-"tree contents."
+#, priority:280
+msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:647
-#, no-wrap
+#, no-wrap, priority:280
msgid "--relative[=<path>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:654
-msgid ""
-"When run from a subdirectory of the project, it can be told to exclude "
-"changes outside the directory and show pathnames relative to it with this "
-"option. When you are not in a subdirectory (e.g. in a bare repository), you "
-"can name which subdirectory to make the output relative to by giving a "
-"<path> as an argument."
+#, priority:280
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
-#, no-wrap
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
-#, no-wrap
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
#. type: Plain text
#: en/diff-options.txt:659
-#, fuzzy
+#, fuzzy, priority:280
msgid "Treat all files as text."
msgstr "tratar todos los archivos como texto"
#. type: Labeled list
#: en/diff-options.txt:660
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--ignore-cr-at-eol"
msgstr "--ignore-cr-at-eol"
#. type: Plain text
#: en/diff-options.txt:662
+#, priority:280
msgid "Ignore carriage-return at the end of line when doing a comparison."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:663
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
#. type: Labeled list
#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
-#, no-wrap
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:673
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:677
-msgid ""
-"Ignore whitespace when comparing lines. This ignores differences even if "
-"one line has whitespace where the other line has none."
+#, priority:280
+msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:678
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
#. type: Plain text
#: en/diff-options.txt:680
-#, fuzzy
+#, fuzzy, priority:280
msgid "Ignore changes whose lines are all blank."
msgstr "ignora cambios cuyas l챠neas son todas en blanco"
#. type: Labeled list
#: en/diff-options.txt:681
-#, no-wrap
+#, no-wrap, priority:280
msgid "--inter-hunk-context=<lines>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:686
-msgid ""
-"Show the context between diff hunks, up to the specified number of lines, "
-"thereby fusing hunks that are close to each other. Defaults to "
-"`diff.interHunkContext` or 0 if the config option is unset."
+#, priority:280
+msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
-#, no-wrap
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
+#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
-#, no-wrap
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
#. type: Plain text
#: en/diff-options.txt:690
+#, priority:280
msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
-#, no-wrap
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
#. type: Plain text
#: en/diff-options.txt:697
-msgid ""
-"Make the program exit with codes similar to diff(1). That is, it exits with "
-"1 if there were differences and 0 means no differences."
+#, priority:280
+msgid "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
-#, no-wrap
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
#. type: Plain text
#: en/diff-options.txt:700
+#, priority:280
msgid "Disable all output of the program. Implies `--exit-code`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:703
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--ext-diff"
msgstr "--ext-diff"
#. type: Plain text
#: en/diff-options.txt:707
-msgid ""
-"Allow an external diff helper to be executed. If you set an external diff "
-"driver with linkgit:gitattributes[5], you need to use this option with "
-"linkgit:git-log[1] and friends."
+#, priority:280
+msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:708
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
#. type: Plain text
#: en/diff-options.txt:710
+#, priority:280
msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
-#, no-wrap
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
-#, no-wrap
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
#. type: Plain text
#: en/diff-options.txt:721
-msgid ""
-"Allow (or disallow) external text conversion filters to be run when "
-"comparing binary files. See linkgit:gitattributes[5] for details. Because "
-"textconv filters are typically a one-way conversion, the resulting diff is "
-"suitable for human consumption, but cannot be applied. For this reason, "
-"textconv filters are enabled by default only for linkgit:git-diff[1] and "
-"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing "
-"commands."
+#, priority:280
+msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:722 en/git-status.txt:87
-#, no-wrap
+#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:734
-msgid ""
-"Ignore changes to submodules in the diff generation. <when> can be either "
-"\"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using "
-"\"none\" will consider the submodule modified when it either contains "
-"untracked or modified files or its HEAD differs from the commit recorded in "
-"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" "
-"is used submodules are not considered dirty when they only contain untracked "
-"content (but they are still scanned for modified content). Using \"dirty\" "
-"ignores all changes to the work tree of submodules, only changes to the "
-"commits stored in the superproject are shown (this was the behavior until "
-"1.7.0). Using \"all\" hides all changes to submodules."
+#, priority:280
+msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:735
-#, no-wrap
+#, no-wrap, priority:280
msgid "--src-prefix=<prefix>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:737
-#, fuzzy
+#, fuzzy, priority:280
msgid "Show the given source prefix instead of \"a/\"."
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
#. type: Labeled list
#: en/diff-options.txt:738
-#, no-wrap
+#, no-wrap, priority:280
msgid "--dst-prefix=<prefix>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:740
-#, fuzzy
+#, fuzzy, priority:280
msgid "Show the given destination prefix instead of \"b/\"."
msgstr "mostrar el prefijo de destino en lugar de \"b/\""
#. type: Labeled list
#: en/diff-options.txt:741
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-prefix"
msgstr "--no-prefix"
#. type: Plain text
#: en/diff-options.txt:743
-#, fuzzy
+#, fuzzy, priority:280
msgid "Do not show any source or destination prefix."
msgstr "no mostrar ning첬n prefijo de fuente o destino"
#. type: Labeled list
#: en/diff-options.txt:744
-#, no-wrap
+#, no-wrap, priority:280
msgid "--line-prefix=<prefix>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:746
-#, fuzzy
+#, fuzzy, priority:280
msgid "Prepend an additional prefix to every line of output."
msgstr "anteponer un prefijo adicional a cada l챠nea mostrada"
#. type: Labeled list
#: en/diff-options.txt:747
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
#. type: Plain text
#: en/diff-options.txt:754
-msgid ""
-"By default entries added by \"git add -N\" appear as an existing empty file "
-"in \"git diff\" and a new file in \"git diff --cached\". This option makes "
-"the entry appear as a new file in \"git diff\" and non-existent in \"git "
-"diff --cached\". This option could be reverted with "
-"`--ita-visible-in-index`. Both options are experimental and could be removed "
-"in future."
+#, priority:280
+msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\". This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:756
-msgid ""
-"For more detailed explanation on these common options, see also "
-"linkgit:gitdiffcore[7]."
+#, priority:280
+msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
-#, no-wrap
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
#. type: Plain text
#: en/fetch-options.txt:3
+#, priority:220
msgid "Fetch all remotes."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:5
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--append"
msgstr "--append"
#. type: Plain text
#: en/fetch-options.txt:9
-msgid ""
-"Append ref names and object names of fetched refs to the existing contents "
-"of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` "
-"will be overwritten."
+#, priority:220
+msgid "Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:10
-#, no-wrap
+#, no-wrap, priority:220
msgid "--depth=<depth>"
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:16
-msgid ""
-"Limit fetching to the specified number of commits from the tip of each "
-"remote branch history. If fetching to a 'shallow' repository created by `git "
-"clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or "
-"shorten the history to the specified number of commits. Tags for the "
-"deepened commits are not fetched."
+#, priority:220
+msgid "Limit fetching to the specified number of commits from the tip of each remote branch history. If fetching to a 'shallow' repository created by `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or shorten the history to the specified number of commits. Tags for the deepened commits are not fetched."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:17
-#, no-wrap
+#, no-wrap, priority:220
msgid "--deepen=<depth>"
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:21
-msgid ""
-"Similar to --depth, except it specifies the number of commits from the "
-"current shallow boundary instead of from the tip of each remote branch "
-"history."
+#, priority:220
+msgid "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:22 en/git-clone.txt:221 en/git-fetch-pack.txt:90
-#, no-wrap
+#, no-wrap, priority:300
msgid "--shallow-since=<date>"
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:25 en/git-fetch-pack.txt:93
-msgid ""
-"Deepen or shorten the history of a shallow repository to include all "
-"reachable commits after <date>."
+#, priority:220
+msgid "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:26 en/git-clone.txt:224 en/git-fetch-pack.txt:94
-#, no-wrap
+#, no-wrap, priority:300
msgid "--shallow-exclude=<revision>"
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:30 en/git-fetch-pack.txt:98
-msgid ""
-"Deepen or shorten the history of a shallow repository to exclude commits "
-"reachable from a specified remote branch or tag. This option can be "
-"specified multiple times."
+#, priority:220
+msgid "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--unshallow"
msgstr "--unshallow"
#. type: Plain text
#: en/fetch-options.txt:35
-msgid ""
-"If the source repository is complete, convert a shallow repository to a "
-"complete one, removing all the limitations imposed by shallow repositories."
+#, priority:220
+msgid "If the source repository is complete, convert a shallow repository to a complete one, removing all the limitations imposed by shallow repositories."
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:38
-msgid ""
-"If the source repository is shallow, fetch as much as possible so that the "
-"current repository has the same history as the source repository."
+#, priority:220
+msgid "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--update-shallow"
msgstr "--update-shallow"
#. type: Plain text
#: en/fetch-options.txt:44
-msgid ""
-"By default when fetching from a shallow repository, `git fetch` refuses refs "
-"that require updating .git/shallow. This option updates .git/shallow and "
-"accept such refs."
+#, priority:220
+msgid "By default when fetching from a shallow repository, `git fetch` refuses refs that require updating .git/shallow. This option updates .git/shallow and accept such refs."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:45
-#, no-wrap
+#, no-wrap, priority:220
msgid "--negotiation-tip=<commit|glob>"
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:53
-msgid ""
-"By default, Git will report, to the server, commits reachable from all local "
-"refs to find common commits in an attempt to reduce the size of the "
-"to-be-received packfile. If specified, Git will only report commits "
-"reachable from the given tips. This is useful to speed up fetches when the "
-"user knows which local ref is likely to have commits in common with the "
-"upstream ref being fetched."
+#, priority:220
+msgid "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile. If specified, Git will only report commits reachable from the given tips. This is useful to speed up fetches when the user knows which local ref is likely to have commits in common with the upstream ref being fetched."
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:56
-msgid ""
-"This option may be specified more than once; if so, Git will report commits "
-"reachable from any of the given commits."
+#, priority:220
+msgid "This option may be specified more than once; if so, Git will report commits reachable from any of the given commits."
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:60
-msgid ""
-"The argument to this option may be a glob on ref names, a ref, or the "
-"(possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to "
-"specifying this option multiple times, one for each matching ref name."
+#, priority:220
+msgid "The argument to this option may be a glob on ref names, a ref, or the (possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying this option multiple times, one for each matching ref name."
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:63
-msgid ""
-"See also the `fetch.negotiationAlgorithm` configuration variable documented "
-"in linkgit:git-config[1]."
+#, priority:220
+msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
-#, no-wrap
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
#. type: Plain text
#: en/fetch-options.txt:67
+#, priority:220
msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
-#, no-wrap
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
-#, no-wrap
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
#. type: Plain text
#: en/fetch-options.txt:73
-msgid ""
-"When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update "
-"the local branch as discussed"
+#, priority:220
+msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:76
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
"\tdocumentation.\n"
@@ -6011,988 +5272,804 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:79
-#, no-wrap
+#, no-wrap, priority:220
msgid "\tin the `<refspec>` part below.\n"
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:81
-#, no-wrap
+#, no-wrap, priority:220
msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
-#, no-wrap
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
#. type: Labeled list
#: en/fetch-options.txt:83 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--keep"
msgstr "--keep"
#. type: Plain text
#: en/fetch-options.txt:85
-#, fuzzy
+#, fuzzy, priority:220
msgid "Keep downloaded pack."
msgstr "mantener el paquete descargado"
#. type: Labeled list
#: en/fetch-options.txt:87
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--multiple"
msgstr "--multiple"
#. type: Plain text
#: en/fetch-options.txt:90
-msgid ""
-"Allow several <repository> and <group> arguments to be specified. No "
-"<refspec>s may be specified."
+#, priority:220
+msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:91
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--[no-]auto-gc"
msgstr "--[no-]auto-gc"
#. type: Plain text
#: en/fetch-options.txt:94
-msgid ""
-"Run `git gc --auto` at the end to perform garbage collection if needed. This "
-"is enabled by default."
+#, priority:220
+msgid "Run `git gc --auto` at the end to perform garbage collection if needed. This is enabled by default."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:95
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--[no-]write-commit-graph"
msgstr "--[no-]write-commit-graph"
#. type: Plain text
#: en/fetch-options.txt:98
-msgid ""
-"Write a commit-graph after fetching. This overrides the config setting "
-"`fetch.writeCommitGraph`."
+#, priority:220
+msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:100 en/git-push.txt:153
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--prune"
msgstr "--prune"
#. type: Plain text
#: en/fetch-options.txt:110
-msgid ""
-"Before fetching, remove any remote-tracking references that no longer exist "
-"on the remote. Tags are not subject to pruning if they are fetched only "
-"because of the default tag auto-following or due to a --tags option. "
-"However, if tags are fetched due to an explicit refspec (either on the "
-"command line or in the remote configuration, for example if the remote was "
-"cloned with the --mirror option), then they are also subject to "
-"pruning. Supplying `--prune-tags` is a shorthand for providing the tag "
-"refspec."
+#, priority:220
+msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec."
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:112 en/fetch-options.txt:123
+#, priority:220
msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
-#, no-wrap
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
+#, no-wrap, priority:260
msgid "-P"
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:114
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--prune-tags"
msgstr "--prune-tags"
#. type: Plain text
#: en/fetch-options.txt:121
-msgid ""
-"Before fetching, remove any local tags that no longer exist on the remote if "
-"`--prune` is enabled. This option should be used more carefully, unlike "
-"`--prune` it will remove any local references (local tags) that have been "
-"created. This option is a shorthand for providing the explicit tag refspec "
-"along with `--prune`, see the discussion about that in its documentation."
+#, priority:220
+msgid "Before fetching, remove any local tags that no longer exist on the remote if `--prune` is enabled. This option should be used more carefully, unlike `--prune` it will remove any local references (local tags) that have been created. This option is a shorthand for providing the explicit tag refspec along with `--prune`, see the discussion about that in its documentation."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
-#, no-wrap
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
#. type: Labeled list
#: en/fetch-options.txt:129 en/git-clone.txt:239
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--no-tags"
msgstr "--no-tags"
#. type: Plain text
#: en/fetch-options.txt:135
-msgid ""
-"By default, tags that point at objects that are downloaded from the remote "
-"repository are fetched and stored locally. This option disables this "
-"automatic tag following. The default behavior for a remote may be specified "
-"with the remote.<name>.tagOpt setting. See linkgit:git-config[1]."
+#, priority:220
+msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:137
-#, no-wrap
+#, no-wrap, priority:220
msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
-msgid ""
-"When fetching refs listed on the command line, use the specified refspec "
-"(can be given more than once) to map the refs to remote-tracking branches, "
-"instead of the values of `remote.*.fetch` configuration variables for the "
-"remote repository. See section on \"Configured Remote-tracking Branches\" "
-"for details."
+#: en/fetch-options.txt:147
+#, priority:220
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
-#, no-wrap
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
-msgid ""
-"Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into "
-"local tags with the same name), in addition to whatever else would otherwise "
-"be fetched. Using this option alone does not subject tags to pruning, even "
-"if --prune is used (though tags may be pruned anyway if they are also the "
-"destination of an explicit refspec; see `--prune`)."
+#: en/fetch-options.txt:156
+#, priority:220
+msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
-#, no-wrap
+#: en/fetch-options.txt:157
+#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
-msgid ""
-"This option controls if and under what conditions new commits of populated "
-"submodules should be fetched too. It can be used as a boolean option to "
-"completely disable recursion when set to 'no' or to unconditionally recurse "
-"into all populated submodules when set to 'yes', which is the default when "
-"this option is used without any value. Use 'on-demand' to only recurse into "
-"a populated submodule when the superproject retrieves a commit that updates "
-"the submodule's reference to a commit that isn't already in the local "
-"submodule clone."
+#: en/fetch-options.txt:167
+#, priority:220
+msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
-#, no-wrap
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
-#, no-wrap
+#: en/fetch-options.txt:169
+#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
+#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
-msgid ""
-"If the `--multiple` option was specified, the different remotes will be "
-"fetched in parallel. If multiple submodules are fetched, they will be "
-"fetched in parallel. To control them independently, use the config settings "
-"`fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
+#: en/fetch-options.txt:176
+#, priority:220
+msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
-msgid ""
-"Typically, parallel recursive and multi-remote fetches will be faster. By "
-"default fetches are performed sequentially, not in parallel."
+#: en/fetch-options.txt:179
+#, priority:220
+msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
-#, no-wrap
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
-msgid ""
-"Disable recursive fetching of submodules (this has the same effect as using "
-"the `--recurse-submodules=no` option)."
+#: en/fetch-options.txt:183
+#, priority:220
+msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
-#, no-wrap
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
-msgid ""
-"If the remote is fetched successfully, pull and add upstream (tracking) "
-"reference, used by argument-less linkgit:git-pull[1] and other commands. For "
-"more information, see `branch.<name>.merge` and `branch.<name>.remote` in "
-"linkgit:git-config[1]."
+#: en/fetch-options.txt:190
+#, priority:220
+msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
-#, no-wrap
+#: en/fetch-options.txt:191
+#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
-msgid ""
-"Prepend <path> to paths printed in informative messages such as \"Fetching "
-"submodule foo\". This option is used internally when recursing over "
-"submodules."
+#: en/fetch-options.txt:195
+#, priority:220
+msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
-#, no-wrap
+#: en/fetch-options.txt:196
+#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
-msgid ""
-"This option is used internally to temporarily provide a non-negative default "
-"value for the --recurse-submodules option. All other methods of configuring "
-"fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and "
-"linkgit:git-config[1]) override this option, as does specifying "
-"--[no-]recurse-submodules directly."
+#: en/fetch-options.txt:203
+#, priority:220
+msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
-#, no-wrap
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
-msgid ""
-"By default 'git fetch' refuses to update the head which corresponds to the "
-"current branch. This flag disables the check. This is purely for the "
-"internal use for 'git pull' to communicate with 'git fetch', and unless you "
-"are implementing your own Porcelain you are not supposed to use it."
+#: en/fetch-options.txt:213
+#, priority:220
+msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
-#, no-wrap
+#: en/fetch-options.txt:214 en/git-clone.txt:188
+#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
-msgid ""
-"When given, and the repository to fetch from is handled by 'git fetch-pack', "
-"`--exec=<upload-pack>` is passed to the command to specify non-default path "
-"for the command run on the other end."
+#: en/fetch-options.txt:219
+#, priority:220
+msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
-#, no-wrap
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
-msgid ""
-"Pass --quiet to git-fetch-pack and silence any other internally used git "
-"commands. Progress is not reported to the standard error stream."
+#: en/fetch-options.txt:226
+#, priority:220
+msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
-#, no-wrap
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
-#, no-wrap
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
-#, fuzzy
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#, fuzzy, priority:300
msgid "Be verbose."
msgstr "ser verboso"
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
-#, no-wrap
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
-msgid ""
-"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless -q is specified. This flag forces progress "
-"status even if the standard error stream is not directed to a terminal."
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#, priority:220
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
-#, no-wrap
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
+#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
-#, no-wrap
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
+#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
-msgid ""
-"Transmit the given string to the server when communicating using protocol "
-"version 2. The given string must not contain a NUL or LF character. The "
-"server's handling of server options, including unknown ones, is "
-"server-specific. When multiple `--server-option=<option>` are given, they "
-"are all sent to the other side in the order listed on the command line."
+#: en/fetch-options.txt:246 en/git-clone.txt:142
+#, priority:300
+msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
-#, no-wrap
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
-msgid ""
-"By default, git checks if a branch is force-updated during fetch. This can "
-"be disabled through fetch.showForcedUpdates, but the --show-forced-updates "
-"option guarantees this check occurs. See linkgit:git-config[1]."
+#: en/fetch-options.txt:252
+#, priority:220
+msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
-#, no-wrap
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
-msgid ""
-"By default, git checks if a branch is force-updated during fetch. Pass "
-"--no-show-forced-updates or set fetch.showForcedUpdates to false to skip "
-"this check for performance reasons. If used during 'git-pull' the --ff-only "
-"option will still check for forced updates before attempting a fast-forward "
-"update. See linkgit:git-config[1]."
+#: en/fetch-options.txt:259
+#, priority:220
+msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
-#, no-wrap
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
-#, no-wrap
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
+#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
-#, no-wrap
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
-#, no-wrap
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
+#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
#. type: Title =
#: en/git-add.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "git-add(1)"
msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap
+#, no-wrap, priority:300
msgid "NAME"
msgstr ""
#. type: Plain text
#: en/git-add.txt:7
-#, fuzzy
+#, fuzzy, priority:300
msgid "git-add - Add file contents to the index"
msgstr "Agrega contenido de carpetas al 챠ndice"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap
+#, no-wrap, priority:300
msgid "SYNOPSIS"
msgstr ""
#. type: Plain text
#: en/git-add.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
-"-i] [--patch | -p]\n"
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
-"[--renormalize]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
#. type: Plain text
#: en/git-add.txt:25
-msgid ""
-"This command updates the index using the current content found in the "
-"working tree, to prepare the content staged for the next commit. It "
-"typically adds the current content of existing paths as a whole, but with "
-"some options it can also be used to add content with only part of the "
-"changes made to the working tree files applied, or remove paths that do not "
-"exist in the working tree anymore."
+#, priority:300
+msgid "This command updates the index using the current content found in the working tree, to prepare the content staged for the next commit. It typically adds the current content of existing paths as a whole, but with some options it can also be used to add content with only part of the changes made to the working tree files applied, or remove paths that do not exist in the working tree anymore."
msgstr ""
#. type: Plain text
#: en/git-add.txt:31
-msgid ""
-"The \"index\" holds a snapshot of the content of the working tree, and it is "
-"this snapshot that is taken as the contents of the next commit. Thus after "
-"making any changes to the working tree, and before running the commit "
-"command, you must use the `add` command to add any new or modified files to "
-"the index."
+#, priority:300
+msgid "The \"index\" holds a snapshot of the content of the working tree, and it is this snapshot that is taken as the contents of the next commit. Thus after making any changes to the working tree, and before running the commit command, you must use the `add` command to add any new or modified files to the index."
msgstr ""
#. type: Plain text
#: en/git-add.txt:36
-msgid ""
-"This command can be performed multiple times before a commit. It only adds "
-"the content of the specified file(s) at the time the add command is run; if "
-"you want subsequent changes included in the next commit, then you must run "
-"`git add` again to add the new content to the index."
+#, priority:300
+msgid "This command can be performed multiple times before a commit. It only adds the content of the specified file(s) at the time the add command is run; if you want subsequent changes included in the next commit, then you must run `git add` again to add the new content to the index."
msgstr ""
#. type: Plain text
#: en/git-add.txt:39
-msgid ""
-"The `git status` command can be used to obtain a summary of which files have "
-"changes that are staged for the next commit."
+#, priority:300
+msgid "The `git status` command can be used to obtain a summary of which files have changes that are staged for the next commit."
msgstr ""
#. type: Plain text
#: en/git-add.txt:46
-msgid ""
-"The `git add` command will not add ignored files by default. If any ignored "
-"files were explicitly specified on the command line, `git add` will fail "
-"with a list of ignored files. Ignored files reached by directory recursion "
-"or filename globbing performed by Git (quote your globs before the shell) "
-"will be silently ignored. The 'git add' command can be used to add ignored "
-"files with the `-f` (force) option."
+#, priority:300
+msgid "The `git add` command will not add ignored files by default. If any ignored files were explicitly specified on the command line, `git add` will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored. The 'git add' command can be used to add ignored files with the `-f` (force) option."
msgstr ""
#. type: Plain text
#: en/git-add.txt:49
-msgid ""
-"Please see linkgit:git-commit[1] for alternative ways to add content to a "
-"commit."
+#, priority:300
+msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a commit."
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
-#, no-wrap
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
-#, no-wrap
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
+#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
#. type: Plain text
#: en/git-add.txt:65
-msgid ""
-"Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all "
-"matching files. Also a leading directory name (e.g. `dir` to add "
-"`dir/file1` and `dir/file2`) can be given to update the index to match the "
-"current state of the directory as a whole (e.g. specifying `dir` will "
-"record not just a file `dir/file1` modified in the working tree, a file "
-"`dir/file2` added to the working tree, but also a file `dir/file3` removed "
-"from the working tree). Note that older versions of Git used to ignore "
-"removed files; use `--no-all` option if you want to add modified or new "
-"files but ignore removed ones."
+#, priority:300
+msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all matching files. Also a leading directory name (e.g. `dir` to add `dir/file1` and `dir/file2`) can be given to update the index to match the current state of the directory as a whole (e.g. specifying `dir` will record not just a file `dir/file1` modified in the working tree, a file `dir/file2` added to the working tree, but also a file `dir/file3` removed from the working tree). Note that older versions of Git used to ignore removed files; use `--no-all` option if you want to add modified or new files but ignore removed ones."
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
-msgid ""
-"For more details about the <pathspec> syntax, see the 'pathspec' entry in "
-"linkgit:gitglossary[7]."
+#: en/git-add.txt:68 en/git-grep.txt:332
+#, priority:300
+msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
#: en/git-add.txt:73
-msgid ""
-"Don't actually add the file(s), just show if they exist and/or will be "
-"ignored."
+#, priority:300
+msgid "Don't actually add the file(s), just show if they exist and/or will be ignored."
msgstr ""
#. type: Plain text
#: en/git-add.txt:81
-#, fuzzy
+#, fuzzy, priority:300
msgid "Allow adding otherwise ignored files."
msgstr "permitir agregar caso contrario ignorar archivos"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
-#, no-wrap
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
-#, no-wrap
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
#. type: Plain text
#: en/git-add.txt:88
-msgid ""
-"Add modified contents in the working tree interactively to the "
-"index. Optional path arguments may be supplied to limit operation to a "
-"subset of the working tree. See ``Interactive mode'' for details."
+#, priority:300
+msgid "Add modified contents in the working tree interactively to the index. Optional path arguments may be supplied to limit operation to a subset of the working tree. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
#: en/git-add.txt:95
-msgid ""
-"Interactively choose hunks of patch between the index and the work tree and "
-"add them to the index. This gives the user a chance to review the difference "
-"before adding modified contents to the index."
+#, priority:300
+msgid "Interactively choose hunks of patch between the index and the work tree and add them to the index. This gives the user a chance to review the difference before adding modified contents to the index."
msgstr ""
#. type: Plain text
#: en/git-add.txt:99
-msgid ""
-"This effectively runs `add --interactive`, but bypasses the initial command "
-"menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' "
-"for details."
+#, priority:300
+msgid "This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' for details."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
-#, no-wrap
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
-#, no-wrap
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
#. type: Plain text
#: en/git-add.txt:105
-msgid ""
-"Open the diff vs. the index in an editor and let the user edit it. After "
-"the editor was closed, adjust the hunk headers and apply the patch to the "
-"index."
+#, priority:300
+msgid "Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index."
msgstr ""
#. type: Plain text
#: en/git-add.txt:111
-msgid ""
-"The intent of this option is to pick and choose lines of the patch to apply, "
-"or even to modify the contents of lines to be staged. This can be quicker "
-"and more flexible than using the interactive hunk selector. However, it is "
-"easy to confuse oneself and create a patch that does not apply to the "
-"index. See EDITING PATCHES below."
+#, priority:300
+msgid "The intent of this option is to pick and choose lines of the patch to apply, or even to modify the contents of lines to be staged. This can be quicker and more flexible than using the interactive hunk selector. However, it is easy to confuse oneself and create a patch that does not apply to the index. See EDITING PATCHES below."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:113
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--update"
msgstr "--update"
#. type: Plain text
#: en/git-add.txt:117
-msgid ""
-"Update the index just where it already has an entry matching <pathspec>. "
-"This removes as well as modifies index entries to match the working tree, "
-"but adds no new files."
+#, priority:300
+msgid "Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files."
msgstr ""
#. type: Plain text
#: en/git-add.txt:122
-msgid ""
-"If no <pathspec> is given when `-u` option is used, all tracked files in the "
-"entire working tree are updated (old versions of Git used to limit the "
-"update to the current directory and its subdirectories)."
+#, priority:300
+msgid "If no <pathspec> is given when `-u` option is used, all tracked files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:123 en/git-repack.txt:49 en/git-svn.txt:418
-#, no-wrap
+#, no-wrap, priority:300
msgid "-A"
msgstr ""
#. type: Labeled list
#: en/git-add.txt:125
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--no-ignore-removal"
msgstr "--no-ignore-removal"
#. type: Plain text
#: en/git-add.txt:130
-msgid ""
-"Update the index not only where the working tree has a file matching "
-"<pathspec> but also where the index already has an entry. This adds, "
-"modifies, and removes index entries to match the working tree."
+#, priority:300
+msgid "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree."
msgstr ""
#. type: Plain text
#: en/git-add.txt:135
-msgid ""
-"If no <pathspec> is given when `-A` option is used, all files in the entire "
-"working tree are updated (old versions of Git used to limit the update to "
-"the current directory and its subdirectories)."
+#, priority:300
+msgid "If no <pathspec> is given when `-A` option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:136
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--no-all"
msgstr "--no-all"
#. type: Labeled list
#: en/git-add.txt:137
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--ignore-removal"
msgstr "--ignore-removal"
#. type: Plain text
#: en/git-add.txt:142
-msgid ""
-"Update the index by adding new files that are unknown to the index and files "
-"modified in the working tree, but ignore files that have been removed from "
-"the working tree. This option is a no-op when no <pathspec> is used."
+#, priority:300
+msgid "Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This option is a no-op when no <pathspec> is used."
msgstr ""
#. type: Plain text
#: en/git-add.txt:146
-msgid ""
-"This option is primarily to help users who are used to older versions of "
-"Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all "
-"<pathspec>...\", i.e. ignored removed files."
+#, ignore-ellipsis, priority:300
+msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:147 en/git-format-patch.txt:103 en/git-submodule.txt:351
-#, no-wrap
+#, no-wrap, priority:300
msgid "-N"
msgstr ""
#. type: Labeled list
#: en/git-add.txt:148 en/git-apply.txt:77
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--intent-to-add"
msgstr "--intent-to-add"
#. type: Plain text
#: en/git-add.txt:154
-msgid ""
-"Record only the fact that the path will be added later. An entry for the "
-"path is placed in the index with no content. This is useful for, among other "
-"things, showing the unstaged content of such files with `git diff` and "
-"committing them with `git commit -a`."
+#, priority:300
+msgid "Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with `git diff` and committing them with `git commit -a`."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:155 en/git-update-index.txt:55
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--refresh"
msgstr "--refresh"
#. type: Plain text
#: en/git-add.txt:158
-msgid ""
-"Don't add the file(s), but only refresh their stat() information in the "
-"index."
+#, priority:300
+msgid "Don't add the file(s), but only refresh their stat() information in the index."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:159
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--ignore-errors"
msgstr "--ignore-errors"
#. type: Plain text
#: en/git-add.txt:165
-msgid ""
-"If some files could not be added because of errors indexing them, do not "
-"abort the operation, but continue adding the others. The command shall still "
-"exit with non-zero status. The configuration variable `add.ignoreErrors` "
-"can be set to true to make this the default behaviour."
+#, priority:300
+msgid "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable `add.ignoreErrors` can be set to true to make this the default behaviour."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:201
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--ignore-missing"
msgstr "--ignore-missing"
#. type: Plain text
#: en/git-add.txt:171
-msgid ""
-"This option can only be used together with --dry-run. By using this option "
-"the user can check if any of the given files would be ignored, no matter if "
-"they are already present in the work tree or not."
+#, priority:300
+msgid "This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:172
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--no-warn-embedded-repo"
msgstr "--no-warn-embedded-repo"
#. type: Plain text
#: en/git-add.txt:178
-msgid ""
-"By default, `git add` will warn when adding an embedded repository to the "
-"index without using `git submodule add` to create an entry in "
-"`.gitmodules`. This option will suppress the warning (e.g., if you are "
-"manually performing operations on submodules)."
+#, priority:300
+msgid "By default, `git add` will warn when adding an embedded repository to the index without using `git submodule add` to create an entry in `.gitmodules`. This option will suppress the warning (e.g., if you are manually performing operations on submodules)."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:179
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--renormalize"
msgstr "--renormalize"
#. type: Plain text
#: en/git-add.txt:185
-msgid ""
-"Apply the \"clean\" process freshly to all tracked files to forcibly add "
-"them again to the index. This is useful after changing `core.autocrlf` "
-"configuration or the `text` attribute in order to correct files added with "
-"wrong CRLF/LF line endings. This option implies `-u`."
+#, priority:300
+msgid "Apply the \"clean\" process freshly to all tracked files to forcibly add them again to the index. This is useful after changing `core.autocrlf` configuration or the `text` attribute in order to correct files added with wrong CRLF/LF line endings. This option implies `-u`."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:186 en/git-update-index.txt:86
-#, no-wrap
+#, no-wrap, priority:300
msgid "--chmod=(+|-)x"
msgstr ""
#. type: Plain text
#: en/git-add.txt:190
-msgid ""
-"Override the executable bit of the added files. The executable bit is only "
-"changed in the index, the files on disk are left unchanged."
+#, priority:300
+msgid "Override the executable bit of the added files. The executable bit is only changed in the index, the files on disk are left unchanged."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
-#, no-wrap
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
+#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
-msgid ""
-"Pathspec is passed in `<file>` instead of commandline args. If `<file>` is "
-"exactly `-` then standard input is used. Pathspec elements are separated by "
-"LF or CR/LF. Pathspec elements can be quoted as explained for the "
-"configuration variable `core.quotePath` (see linkgit:git-config[1]). See "
-"also `--pathspec-file-nul` and global `--literal-pathspecs`."
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
+#, priority:300
+msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
-#, no-wrap
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
-msgid ""
-"Only meaningful with `--pathspec-from-file`. Pathspec elements are separated "
-"with NUL character and all other characters are taken literally (including "
-"newlines and quotes)."
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
+#, priority:300
+msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
-#, no-wrap
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
-msgid ""
-"This option can be used to separate command-line options from the list of "
-"files, (useful when filenames might be mistaken for command-line options)."
+#: en/git-add.txt:208 en/git-rm.txt:64
+#, priority:300
+msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
-#, no-wrap
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
#. type: Plain text
#: en/git-add.txt:215
-msgid ""
-"Adds content from all `*.txt` files under `Documentation` directory and its "
-"subdirectories:"
+#, priority:300
+msgid "Adds content from all `*.txt` files under `Documentation` directory and its subdirectories:"
msgstr ""
#. type: delimited block -
#: en/git-add.txt:218
-#, no-wrap
+#, no-wrap, priority:300
msgid "$ git add Documentation/\\*.txt\n"
msgstr ""
#. type: Plain text
#: en/git-add.txt:223
-msgid ""
-"Note that the asterisk `*` is quoted from the shell in this example; this "
-"lets the command include the files from subdirectories of `Documentation/` "
-"directory."
+#, priority:300
+msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets the command include the files from subdirectories of `Documentation/` directory."
msgstr ""
#. type: Plain text
#: en/git-add.txt:225
+#, priority:300
msgid "Considers adding content from all git-*.sh scripts:"
msgstr ""
#. type: delimited block -
#: en/git-add.txt:228
-#, no-wrap
+#, no-wrap, priority:300
msgid "$ git add git-*.sh\n"
msgstr ""
#. type: Plain text
#: en/git-add.txt:233
-msgid ""
-"Because this example lets the shell expand the asterisk (i.e. you are "
-"listing the files explicitly), it does not consider `subdir/git-foo.sh`."
+#, priority:300
+msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not consider `subdir/git-foo.sh`."
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
-#, no-wrap
+#: en/git-add.txt:235 en/git-rebase.txt:749
+#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
#. type: Plain text
#: en/git-add.txt:239
-msgid ""
-"When the command enters the interactive mode, it shows the output of the "
-"'status' subcommand, and then goes into its interactive command loop."
+#, priority:300
+msgid "When the command enters the interactive mode, it shows the output of the 'status' subcommand, and then goes into its interactive command loop."
msgstr ""
#. type: Plain text
#: en/git-add.txt:244 en/git-clean.txt:85
-msgid ""
-"The command loop shows the list of subcommands available, and gives a prompt "
-"\"What now> \". In general, when the prompt ends with a single '>', you can "
-"pick only one of the choices given and type return, like this:"
+#, priority:300
+msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
msgstr ""
#. type: delimited block -
#: en/git-add.txt:250
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
" *** Commands ***\n"
" 1: status 2: update 3: revert 4: add untracked\n"
@@ -7002,34 +6079,31 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:254
-msgid ""
-"You also could say `s` or `sta` or `status` above as long as the choice is "
-"unique."
+#, priority:300
+msgid "You also could say `s` or `sta` or `status` above as long as the choice is unique."
msgstr ""
#. type: Plain text
#: en/git-add.txt:256
+#, priority:300
msgid "The main command loop has 6 subcommands (plus help and quit)."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:257
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:300
msgid "status"
msgstr "--status"
#. type: Plain text
#: en/git-add.txt:264
-msgid ""
-"This shows the change between HEAD and index (i.e. what will be committed if "
-"you say `git commit`), and between index and working tree files (i.e. what "
-"you could stage further before `git commit` using `git add`) for each path. "
-"A sample output looks like this:"
+#, priority:300
+msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:"
msgstr ""
#. type: delimited block -
#: en/git-add.txt:269
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
" staged unstaged path\n"
" 1: binary nothing foo.png\n"
@@ -7038,42 +6112,31 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:280
-msgid ""
-"It shows that foo.png has differences from HEAD (but that is binary so line "
-"count cannot be shown) and there is no difference between indexed copy and "
-"the working tree version (if the working tree version were also different, "
-"'binary' would have been shown in place of 'nothing'). The other file, "
-"git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if "
-"you commit what is in the index, but working tree file has further "
-"modifications (one addition and one deletion)."
+#, priority:300
+msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:281 en/git-update-ref.txt:94
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "update"
msgstr "update"
#. type: Plain text
#: en/git-add.txt:290
-msgid ""
-"This shows the status information and issues an \"Update>>\" prompt. When "
-"the prompt ends with double '>>', you can make more than one selection, "
-"concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 "
-"7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range "
-"is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
-"from the list. You can say '*' to choose everything."
+#, priority:300
+msgid "This shows the status information and issues an \"Update>>\" prompt. When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything."
msgstr ""
#. type: Plain text
#: en/git-add.txt:293
+#, priority:300
msgid "What you chose are then highlighted with '*', like this:"
msgstr ""
#. type: delimited block -
#: en/git-add.txt:298
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
" staged unstaged path\n"
" 1: binary nothing foo.png\n"
@@ -7082,67 +6145,61 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:302
+#, priority:300
msgid "To remove selection, prefix the input with `-` like this:"
msgstr ""
#. type: delimited block -
#: en/git-add.txt:305
-#, no-wrap
+#, no-wrap, priority:300
msgid "Update>> -2\n"
msgstr ""
#. type: Plain text
#: en/git-add.txt:309
-msgid ""
-"After making the selection, answer with an empty line to stage the contents "
-"of working tree files for selected paths in the index."
+#, priority:300
+msgid "After making the selection, answer with an empty line to stage the contents of working tree files for selected paths in the index."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:310
-#, no-wrap
+#, no-wrap, priority:300
msgid "revert"
msgstr "revertir"
#. type: Plain text
#: en/git-add.txt:315
-msgid ""
-"This has a very similar UI to 'update', and the staged information for "
-"selected paths are reverted to that of the HEAD version. Reverting new "
-"paths makes them untracked."
+#, priority:300
+msgid "This has a very similar UI to 'update', and the staged information for selected paths are reverted to that of the HEAD version. Reverting new paths makes them untracked."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:316
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:300
msgid "add untracked"
msgstr "Agregar no rastreados"
#. type: Plain text
#: en/git-add.txt:320
-msgid ""
-"This has a very similar UI to 'update' and 'revert', and lets you add "
-"untracked paths to the index."
+#, priority:300
+msgid "This has a very similar UI to 'update' and 'revert', and lets you add untracked paths to the index."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:321
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:300
msgid "patch"
msgstr "ruta"
#. type: Plain text
#: en/git-add.txt:328
-msgid ""
-"This lets you choose one path out of a 'status' like selection. After "
-"choosing the path, it presents the diff between the index and the working "
-"tree file and asks you if you want to stage the change of each hunk. You "
-"can select one of the following options and type return:"
+#, priority:300
+msgid "This lets you choose one path out of a 'status' like selection. After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage the change of each hunk. You can select one of the following options and type return:"
msgstr ""
#. type: Plain text
#: en/git-add.txt:343
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -7162,217 +6219,187 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:346
-msgid ""
-"After deciding the fate for all hunks, if there is any hunk that was chosen, "
-"the index is updated with the selected hunks."
+#, priority:300
+msgid "After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks."
msgstr ""
#. type: Plain text
#: en/git-add.txt:349
-msgid ""
-"You can omit having to type return here, by setting the configuration "
-"variable `interactive.singleKey` to `true`."
+#, priority:300
+msgid "You can omit having to type return here, by setting the configuration variable `interactive.singleKey` to `true`."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:350
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "diff"
msgstr "diff"
#. type: Plain text
#: en/git-add.txt:354
+#, priority:300
msgid "This lets you review what will be committed (i.e. between HEAD and index)."
msgstr ""
#. type: Title -
#: en/git-add.txt:357
-#, no-wrap
+#, no-wrap, priority:300
msgid "EDITING PATCHES"
msgstr ""
#. type: Plain text
#: en/git-add.txt:367
-msgid ""
-"Invoking `git add -e` or selecting `e` from the interactive hunk selector "
-"will open a patch in your editor; after the editor exits, the result is "
-"applied to the index. You are free to make arbitrary changes to the patch, "
-"but note that some changes may have confusing results, or even result in a "
-"patch that cannot be applied. If you want to abort the operation entirely "
-"(i.e., stage nothing new in the index), simply delete all lines of the "
-"patch. The list below describes some common things you may see in a patch, "
-"and which editing operations make sense on them."
+#, priority:300
+msgid "Invoking `git add -e` or selecting `e` from the interactive hunk selector will open a patch in your editor; after the editor exits, the result is applied to the index. You are free to make arbitrary changes to the patch, but note that some changes may have confusing results, or even result in a patch that cannot be applied. If you want to abort the operation entirely (i.e., stage nothing new in the index), simply delete all lines of the patch. The list below describes some common things you may see in a patch, and which editing operations make sense on them."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:369
-#, no-wrap
+#, no-wrap, priority:300
msgid "added content"
msgstr ""
#. type: Plain text
#: en/git-add.txt:373
-msgid ""
-"Added content is represented by lines beginning with \"{plus}\". You can "
-"prevent staging any addition lines by deleting them."
+#, priority:300
+msgid "Added content is represented by lines beginning with \"{plus}\". You can prevent staging any addition lines by deleting them."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:374
-#, no-wrap
+#, no-wrap, priority:300
msgid "removed content"
msgstr ""
#. type: Plain text
#: en/git-add.txt:378
-msgid ""
-"Removed content is represented by lines beginning with \"-\". You can "
-"prevent staging their removal by converting the \"-\" to a \" \" (space)."
+#, priority:300
+msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:379
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:300
msgid "modified content"
msgstr "contenido modificado, "
#. type: Plain text
#: en/git-add.txt:386
-msgid ""
-"Modified content is represented by \"-\" lines (removing the old content) "
-"followed by \"{plus}\" lines (adding the replacement content). You can "
-"prevent staging the modification by converting \"-\" lines to \" \", and "
-"removing \"{plus}\" lines. Beware that modifying only half of the pair is "
-"likely to introduce confusing changes to the index."
+#, priority:300
+msgid "Modified content is represented by \"-\" lines (removing the old content) followed by \"{plus}\" lines (adding the replacement content). You can prevent staging the modification by converting \"-\" lines to \" \", and removing \"{plus}\" lines. Beware that modifying only half of the pair is likely to introduce confusing changes to the index."
msgstr ""
#. type: Plain text
#: en/git-add.txt:394
-msgid ""
-"There are also more complex operations that can be performed. But beware "
-"that because the patch is applied only to the index and not the working "
-"tree, the working tree will appear to \"undo\" the change in the index. For "
-"example, introducing a new line into the index that is in neither the HEAD "
-"nor the working tree will stage the new line for commit, but the line will "
-"appear to be reverted in the working tree."
+#, priority:300
+msgid "There are also more complex operations that can be performed. But beware that because the patch is applied only to the index and not the working tree, the working tree will appear to \"undo\" the change in the index. For example, introducing a new line into the index that is in neither the HEAD nor the working tree will stage the new line for commit, but the line will appear to be reverted in the working tree."
msgstr ""
#. type: Plain text
#: en/git-add.txt:396
+#, priority:300
msgid "Avoid using these constructs, or do so with extreme caution."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:398
-#, no-wrap
+#, no-wrap, priority:300
msgid "removing untouched content"
msgstr ""
#. type: Plain text
#: en/git-add.txt:404
-msgid ""
-"Content which does not differ between the index and working tree may be "
-"shown on context lines, beginning with a \" \" (space). You can stage "
-"context lines for removal by converting the space to a \"-\". The resulting "
-"working tree file will appear to re-add the content."
+#, priority:300
+msgid "Content which does not differ between the index and working tree may be shown on context lines, beginning with a \" \" (space). You can stage context lines for removal by converting the space to a \"-\". The resulting working tree file will appear to re-add the content."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:405
-#, no-wrap
+#, no-wrap, priority:300
msgid "modifying existing content"
msgstr ""
#. type: Plain text
#: en/git-add.txt:412
-msgid ""
-"One can also modify context lines by staging them for removal (by converting "
-"\" \" to \"-\") and adding a \"{plus}\" line with the new content. "
-"Similarly, one can modify \"{plus}\" lines for existing additions or "
-"modifications. In all cases, the new modification will appear reverted in "
-"the working tree."
+#, priority:300
+msgid "One can also modify context lines by staging them for removal (by converting \" \" to \"-\") and adding a \"{plus}\" line with the new content. Similarly, one can modify \"{plus}\" lines for existing additions or modifications. In all cases, the new modification will appear reverted in the working tree."
msgstr ""
#. type: Labeled list
#: en/git-add.txt:413
-#, no-wrap
+#, no-wrap, priority:300
msgid "new content"
msgstr ""
#. type: Plain text
#: en/git-add.txt:418
-msgid ""
-"You may also add new content that does not exist in the patch; simply add "
-"new lines, each starting with \"{plus}\". The addition will appear reverted "
-"in the working tree."
+#, priority:300
+msgid "You may also add new content that does not exist in the patch; simply add new lines, each starting with \"{plus}\". The addition will appear reverted in the working tree."
msgstr ""
#. type: Plain text
#: en/git-add.txt:422
-msgid ""
-"There are also several operations which should be avoided entirely, as they "
-"will make the patch impossible to apply:"
+#, priority:300
+msgid "There are also several operations which should be avoided entirely, as they will make the patch impossible to apply:"
msgstr ""
#. type: Plain text
#: en/git-add.txt:424
+#, priority:300
msgid "adding context (\" \") or removal (\"-\") lines"
msgstr ""
#. type: Plain text
#: en/git-add.txt:425
+#, priority:300
msgid "deleting context or removal lines"
msgstr ""
#. type: Plain text
#: en/git-add.txt:426
+#, priority:300
msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
-#, no-wrap
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
#: en/git-add.txt:435
#, ignore-same, priority:300
-msgid ""
-"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] "
-"linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
-msgstr ""
-"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
-"mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
#. type: Title =
#: en/git-am.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-am(1)"
msgstr "git-am(1)"
#. type: Plain text
#: en/git-am.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-am - Apply a series of patches from a mailbox"
msgstr "Aplicar una serie de parches de un mailbox"
#. type: Plain text
#: en/git-am.txt:20
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -7381,172 +6408,150 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
#: en/git-am.txt:26
-msgid ""
-"Splits mail messages in a mailbox into commit log message, authorship "
-"information and patches, and applies them to the current branch."
+#, priority:100
+msgid "Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:29
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "(<mbox>|<Maildir>)..."
msgstr ""
#. type: Plain text
#: en/git-am.txt:33
-msgid ""
-"The list of mailbox files to read patches from. If you do not supply this "
-"argument, the command reads from the standard input. If you supply "
-"directories, they will be treated as Maildirs."
+#, priority:100
+msgid "The list of mailbox files to read patches from. If you do not supply this argument, the command reads from the standard input. If you supply directories, they will be treated as Maildirs."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
-#, no-wrap
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
#. type: Plain text
#: en/git-am.txt:39
-msgid ""
-"Add a `Signed-off-by:` line to the commit message, using the committer "
-"identity of yourself. See the signoff option in linkgit:git-commit[1] for "
-"more information."
+#, priority:100
+msgid "Add a `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Plain text
#: en/git-am.txt:43
+#, priority:100
msgid "Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:44 en/git-quiltimport.txt:59
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-non-patch"
msgstr "--keep-non-patch"
#. type: Plain text
#: en/git-am.txt:46 en/git-quiltimport.txt:61
+#, priority:100
msgid "Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:47
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]keep-cr"
msgstr "--[no-]keep-cr"
#. type: Plain text
#: en/git-am.txt:52
-msgid ""
-"With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with "
-"the same option, to prevent it from stripping CR at the end of "
-"lines. `am.keepcr` configuration variable can be used to specify the default "
-"behaviour. `--no-keep-cr` is useful to override `am.keepcr`."
+#, priority:100
+msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with the same option, to prevent it from stripping CR at the end of lines. `am.keepcr` configuration variable can be used to specify the default behaviour. `--no-keep-cr` is useful to override `am.keepcr`."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
-#, no-wrap
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--scissors"
msgstr "--scissors"
#. type: Plain text
#: en/git-am.txt:58
-msgid ""
-"Remove everything in body before a scissors line (see "
-"linkgit:git-mailinfo[1]). Can be activated by default using the "
-"`mailinfo.scissors` configuration variable."
+#, priority:100
+msgid "Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). Can be activated by default using the `mailinfo.scissors` configuration variable."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-scissors"
msgstr "--no-scissors"
#. type: Plain text
#: en/git-am.txt:61
+#, priority:100
msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
-#, no-wrap
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--message-id"
msgstr "--message-id"
#. type: Plain text
#: en/git-am.txt:68
-msgid ""
-"Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that "
-"the Message-ID header is added to the commit message. The `am.messageid` "
-"configuration variable can be used to specify the default behaviour."
+#, priority:100
+msgid "Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that the Message-ID header is added to the commit message. The `am.messageid` configuration variable can be used to specify the default behaviour."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-message-id"
msgstr "--no-message-id"
#. type: Plain text
#: en/git-am.txt:72
-msgid ""
-"Do not add the Message-ID header to the commit message. `no-message-id` is "
-"useful to override `am.messageid`."
+#, priority:100
+msgid "Do not add the Message-ID header to the commit message. `no-message-id` is useful to override `am.messageid`."
msgstr ""
#. type: Plain text
#: en/git-am.txt:76
+#, priority:100
msgid "Be quiet. Only print error messages."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:78
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--utf8"
msgstr "--utf8"
#. type: Plain text
#: en/git-am.txt:84
-msgid ""
-"Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The "
-"proposed commit log message taken from the e-mail is re-coded into UTF-8 "
-"encoding (configuration variable `i18n.commitencoding` can be used to "
-"specify project's preferred encoding if it is not UTF-8)."
+#, priority:100
+msgid "Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitencoding` can be used to specify project's preferred encoding if it is not UTF-8)."
msgstr ""
#. type: Plain text
#: en/git-am.txt:87
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"This was optional in prior versions of git, but now it is the\n"
"default. You can use `--no-utf8` to override this.\n"
@@ -7554,467 +6559,406 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-utf8"
msgstr "--no-utf8"
#. type: Plain text
#: en/git-am.txt:91
+#, priority:100
msgid "Pass `-n` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:85
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "-3"
msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:86
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--3way"
msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-3way"
msgstr "--no-3way"
#. type: Plain text
#: en/git-am.txt:101
-msgid ""
-"When the patch does not apply cleanly, fall back on 3-way merge if the patch "
-"records the identity of blobs it is supposed to apply to and we have those "
-"blobs available locally. `--no-3way` can be used to override am.threeWay "
-"configuration variable. For more information, see am.threeWay in "
-"linkgit:git-config[1]."
+#, priority:100
+msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally. `--no-3way` can be used to override am.threeWay configuration variable. For more information, see am.threeWay in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
-#, no-wrap
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
-#, no-wrap
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
-msgid ""
-"Allow the rerere mechanism to update the index with the result of "
-"auto-conflict resolution if possible."
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
+#, priority:240
+msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
-#, no-wrap
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
-#, no-wrap
+#: en/git-am.txt:109 en/git-rebase.txt:425
+#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
-#, no-wrap
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
+#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:111 en/git-apply.txt:123
-#, no-wrap
+#, no-wrap, priority:100
msgid "-p<n>"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:112
-#, no-wrap
+#, no-wrap, priority:100
msgid "--directory=<dir>"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:113
-#, no-wrap
+#, no-wrap, priority:100
msgid "--exclude=<path>"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:114
-#, no-wrap
+#, no-wrap, priority:100
msgid "--include=<path>"
msgstr ""
#. type: Labeled list
#: en/git-am.txt:115 en/git-apply.txt:108
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--reject"
msgstr "--reject"
#. type: Plain text
#: en/git-am.txt:119
-msgid ""
-"These flags are passed to the 'git apply' (see linkgit:git-apply[1]) "
-"program that applies the patch."
+#, priority:100
+msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:120
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--patch-format"
msgstr "--patch-format"
#. type: Plain text
#: en/git-am.txt:126
-msgid ""
-"By default the command will try to detect the patch format "
-"automatically. This option allows the user to bypass the automatic detection "
-"and specify the patch format that the patch(es) should be interpreted "
-"as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg."
+#, priority:100
+msgid "By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg."
msgstr ""
#. type: Plain text
#: en/git-am.txt:130
-#, fuzzy
+#, fuzzy, priority:100
msgid "Run interactively."
msgstr "ejecutar de manera interactiva"
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
-#, no-wrap
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
#. type: Plain text
#: en/git-am.txt:137
-msgid ""
-"By default the command records the date from the e-mail message as the "
-"commit author date, and uses the time of commit creation as the committer "
-"date. This allows the user to lie about the committer date by using the same "
-"value as the author date."
+#, priority:100
+msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
-#, no-wrap
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
#. type: Plain text
#: en/git-am.txt:144
-msgid ""
-"By default the command records the date from the e-mail message as the "
-"commit author date, and uses the time of commit creation as the committer "
-"date. This allows the user to lie about the author date by using the same "
-"value as the committer date."
+#, priority:100
+msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the author date by using the same value as the committer date."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
-#, no-wrap
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
#. type: Plain text
#: en/git-am.txt:148
-msgid ""
-"Skip the current patch. This is only meaningful when restarting an aborted "
-"patch."
+#, priority:100
+msgid "Skip the current patch. This is only meaningful when restarting an aborted patch."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
-#, no-wrap
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
+#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
-#, no-wrap
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
+#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
-msgid ""
-"GPG-sign commits. The `keyid` argument is optional and defaults to the "
-"committer identity; if specified, it must be stuck to the option without a "
-"space."
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
+#, priority:280
+msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:246 en/sequencer.txt:1
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
-#, no-wrap
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:157
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--resolved"
msgstr "--resolved"
#. type: Plain text
#: en/git-am.txt:164
-msgid ""
-"After a patch failure (e.g. attempting to apply conflicting patch), the user "
-"has applied it by hand and the index file stores the result of the "
-"application. Make a commit using the authorship and commit log extracted "
-"from the e-mail message and the current index file, and continue."
+#, priority:100
+msgid "After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:165
-#, no-wrap
+#, no-wrap, priority:100
msgid "--resolvemsg=<msg>"
msgstr ""
#. type: Plain text
#: en/git-am.txt:171
-msgid ""
-"When a patch failure occurs, <msg> will be printed to the screen before "
-"exiting. This overrides the standard message informing you to use "
-"`--continue` or `--skip` to handle the failure. This is solely for internal "
-"use between 'git rebase' and 'git am'."
+#, priority:100
+msgid "When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
#. type: Plain text
#: en/git-am.txt:174
-#, fuzzy
+#, fuzzy, priority:100
msgid "Restore the original branch and abort the patching operation."
msgstr "restaurar la rama original y abortar la operaci처n de parchado."
#. type: Labeled list
#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
#. type: Plain text
#: en/git-am.txt:178
+#, priority:100
msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, no-wrap
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
-msgid ""
-"Show the entire e-mail message \"git am\" has stopped at, because of "
-"conflicts."
+#: en/git-am.txt:184
+#, priority:100
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
-#, no-wrap
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
+#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
-msgid ""
-"The commit author name is taken from the \"From: \" line of the message, and "
-"commit author date is taken from the \"Date: \" line of the message. The "
-"\"Subject: \" line is used as the title of the commit, after stripping "
-"common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to "
-"concisely describe what the commit is about in one line of text."
+#: en/git-am.txt:194
+#, priority:100
+msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
-msgid ""
-"\"From: \", \"Date: \", and \"Subject: \" lines starting the body override "
-"the respective commit author name and title values taken from the headers."
+#: en/git-am.txt:197
+#, priority:100
+msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
-msgid ""
-"The commit message is formed by the title taken from the \"Subject: \", a "
-"blank line and the body of the message up to where the patch begins. Excess "
-"whitespace at the end of each line is automatically stripped."
+#: en/git-am.txt:202
+#, priority:100
+msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
-msgid ""
-"The patch is expected to be inline, directly following the message. Any "
-"line that is of the form:"
+#: en/git-am.txt:205
+#, priority:100
+msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
+#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
+#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
+#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
-msgid ""
-"is taken as the beginning of a patch, and the commit log message is "
-"terminated before the first occurrence of such a line."
+#: en/git-am.txt:212
+#, priority:100
+msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
-msgid ""
-"When initially invoking `git am`, you give it the names of the mailboxes to "
-"process. Upon seeing the first patch that does not apply, it aborts in the "
-"middle. You can recover from this in one of two ways:"
+#: en/git-am.txt:216
+#, priority:100
+msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
+#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
-msgid ""
-"hand resolve the conflict in the working directory, and update the index "
-"file to bring it into a state that the patch should have produced. Then run "
-"the command with the `--continue` option."
+#: en/git-am.txt:223
+#, priority:100
+msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
-msgid ""
-"The command refuses to process new mailboxes until the current operation is "
-"finished, so if you decide to start over from scratch, run `git am --abort` "
-"before running the command with mailbox names."
+#: en/git-am.txt:228
+#, priority:100
+msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
-msgid ""
-"Before any patches are applied, ORIG_HEAD is set to the tip of the current "
-"branch. This is useful if you have problems with multiple commits, like "
-"running 'git am' on the wrong branch or an error in the commits that is more "
-"easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
+#: en/git-am.txt:234
+#, priority:100
+msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
-#, no-wrap
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
+#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
-msgid ""
-"This command can run `applypatch-msg`, `pre-applypatch`, and "
-"`post-applypatch` hooks. See linkgit:githooks[5] for more information."
+#: en/git-am.txt:240
+#, priority:100
+msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
#. type: Title =
#: en/git-annotate.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-annotate(1)"
msgstr "git-annotate(1)"
#. type: Plain text
#: en/git-annotate.txt:7
+#, priority:100
msgid "git-annotate - Annotate file lines with commit information"
msgstr ""
#. type: Plain text
#: en/git-annotate.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git annotate' [<options>] <file> [<revision>]\n"
msgstr ""
#. type: Plain text
#: en/git-annotate.txt:17
-msgid ""
-"Annotates each line in the given file with information from the commit which "
-"introduced the line. Optionally annotates from a given revision."
+#, priority:100
+msgid "Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision."
msgstr ""
#. type: Plain text
#: en/git-annotate.txt:22
-msgid ""
-"The only difference between this command and linkgit:git-blame[1] is that "
-"they use slightly different output formats, and this command exists only for "
-"backward compatibility to support existing scripts, and provide a more "
-"familiar command name for people coming from other SCM systems."
+#, priority:100
+msgid "The only difference between this command and linkgit:git-blame[1] is that they use slightly different output formats, and this command exists only for backward compatibility to support existing scripts, and provide a more familiar command name for people coming from other SCM systems."
msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-apply(1)"
msgstr "git-apply(1)"
#. type: Plain text
#: en/git-apply.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-apply - Apply a patch to files and/or to the index"
msgstr "Aplicar un parche a archivos y/o el 챠ndice"
#. type: Plain text
#: en/git-apply.txt:20
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git apply' [--stat] [--numstat] [--summary] [--check] [--index | "
-"--intent-to-add] [--3way]\n"
+"'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n"
"\t [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n"
"\t [--allow-binary-replacement | --binary] [--reject] [-z]\n"
"\t [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]\n"
@@ -8026,522 +6970,410 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:30
-msgid ""
-"Reads the supplied diff output (i.e. \"a patch\") and applies it to files. "
-"When running from a subdirectory in a repository, patched paths outside the "
-"directory are ignored. With the `--index` option the patch is also applied "
-"to the index, and with the `--cached` option the patch is only applied to "
-"the index. Without these options, the command applies the patch only to "
-"files, and does not require them to be in a Git repository."
+#, priority:100
+msgid "Reads the supplied diff output (i.e. \"a patch\") and applies it to files. When running from a subdirectory in a repository, patched paths outside the directory are ignored. With the `--index` option the patch is also applied to the index, and with the `--cached` option the patch is only applied to the index. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:34
-msgid ""
-"This command applies the patch but does not create a commit. Use "
-"linkgit:git-am[1] to create commits from patches generated by "
-"linkgit:git-format-patch[1] and/or received by email."
+#, priority:100
+msgid "This command applies the patch but does not create a commit. Use linkgit:git-am[1] to create commits from patches generated by linkgit:git-format-patch[1] and/or received by email."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:37
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<patch>..."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:40
-msgid ""
-"The files to read the patch from. '-' can be used to read from the standard "
-"input."
+#, priority:100
+msgid "The files to read the patch from. '-' can be used to read from the standard input."
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
-#, no-wrap
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
#. type: Plain text
#: en/git-apply.txt:44
-msgid ""
-"Instead of applying the patch, output diffstat for the input. Turns off "
-"\"apply\"."
+#, priority:100
+msgid "Instead of applying the patch, output diffstat for the input. Turns off \"apply\"."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:51
-msgid ""
-"Similar to `--stat`, but shows the number of added and deleted lines in "
-"decimal notation and the pathname without abbreviation, to make it more "
-"machine friendly. For binary files, outputs two `-` instead of saying `0 "
-"0`. Turns off \"apply\"."
+#, priority:100
+msgid "Similar to `--stat`, but shows the number of added and deleted lines in decimal notation and the pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. Turns off \"apply\"."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:57
-msgid ""
-"Instead of applying the patch, output a condensed summary of information "
-"obtained from git diff extended headers, such as creations, renames and mode "
-"changes. Turns off \"apply\"."
+#, priority:100
+msgid "Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes. Turns off \"apply\"."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:62
-msgid ""
-"Instead of applying the patch, see if the patch is applicable to the current "
-"working tree and/or the index file and detects errors. Turns off \"apply\"."
+#, priority:100
+msgid "Instead of applying the patch, see if the patch is applicable to the current working tree and/or the index file and detects errors. Turns off \"apply\"."
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
#. type: Plain text
#: en/git-apply.txt:71
-msgid ""
-"When `--check` is in effect, or when applying the patch (which is the "
-"default when none of the options that disables it is in effect), make sure "
-"the patch is applicable to what the current index file records. If the file "
-"to be patched in the working tree is not up to date, it is flagged as an "
-"error. This flag also causes the index file to be updated."
+#, priority:100
+msgid "When `--check` is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records. If the file to be patched in the working tree is not up to date, it is flagged as an error. This flag also causes the index file to be updated."
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
-#, no-wrap
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
#. type: Plain text
#: en/git-apply.txt:76
-msgid ""
-"Apply a patch without touching the working tree. Instead take the cached "
-"data, apply the patch, and store the result in the index without using the "
-"working tree. This implies `--index`."
+#, priority:100
+msgid "Apply a patch without touching the working tree. Instead take the cached data, apply the patch, and store the result in the index without using the working tree. This implies `--index`."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:84
-msgid ""
-"When applying the patch only to the working tree, mark new files to be added "
-"to the index later (see `--intent-to-add` option in "
-"linkgit:git-add[1]). This option is ignored unless running in a Git "
-"repository and `--index` is not specified. Note that `--index` could be "
-"implied by other options such as `--cached` or `--3way`."
+#, priority:100
+msgid "When applying the patch only to the working tree, mark new files to be added to the index later (see `--intent-to-add` option in linkgit:git-add[1]). This option is ignored unless running in a Git repository and `--index` is not specified. Note that `--index` could be implied by other options such as `--cached` or `--3way`."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:93
-msgid ""
-"When the patch does not apply cleanly, fall back on 3-way merge if the patch "
-"records the identity of blobs it is supposed to apply to, and we have those "
-"blobs available locally, possibly leaving the conflict markers in the files "
-"in the working tree for the user to resolve. This option implies the "
-"`--index` option, and is incompatible with the `--reject` and the `--cached` "
-"options."
+#, priority:100
+msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to, and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to resolve. This option implies the `--index` option, and is incompatible with the `--reject` and the `--cached` options."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:94
-#, no-wrap
+#, no-wrap, priority:100
msgid "--build-fake-ancestor=<file>"
msgstr ""
#. type: Plain text
#: en/git-apply.txt:100
-msgid ""
-"Newer 'git diff' output has embedded 'index information' for each blob to "
-"help identify the original version that the patch applies to. When this "
-"flag is given, and if the original versions of the blobs are available "
-"locally, builds a temporary index containing those blobs."
+#, priority:100
+msgid "Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs are available locally, builds a temporary index containing those blobs."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:103
-msgid ""
-"When a pure mode change is encountered (which has no index information), the "
-"information is read from the current index instead."
+#, priority:100
+msgid "When a pure mode change is encountered (which has no index information), the information is read from the current index instead."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:105 en/rev-list-options.txt:680
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
#. type: Plain text
#: en/git-apply.txt:107
-#, fuzzy
+#, fuzzy, priority:100
msgid "Apply the patch in reverse."
msgstr "aplicar el parche en reversa"
#. type: Plain text
#: en/git-apply.txt:114
-msgid ""
-"For atomicity, 'git apply' by default fails the whole patch and does not "
-"touch the working tree when some of the hunks do not apply. This option "
-"makes it apply the parts of the patch that are applicable, and leave the "
-"rejected hunks in corresponding *.rej files."
+#, priority:100
+msgid "For atomicity, 'git apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:118
-msgid ""
-"When `--numstat` has been given, do not munge pathnames, but use a "
-"NUL-terminated machine-readable format."
+#, priority:100
+msgid "When `--numstat` has been given, do not munge pathnames, but use a NUL-terminated machine-readable format."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:128
-msgid ""
-"Remove <n> leading path components (separated by slashes) from traditional "
-"diff paths. E.g., with `-p2`, a patch against `a/dir/file` will be applied "
-"directly to `file`. The default is 1."
+#, priority:100
+msgid "Remove <n> leading path components (separated by slashes) from traditional diff paths. E.g., with `-p2`, a patch against `a/dir/file` will be applied directly to `file`. The default is 1."
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
-msgid ""
-"Ensure at least <n> lines of surrounding context match before and after each "
-"change. When fewer lines of surrounding context exist they all must match. "
-"By default no context is ever ignored."
+#: en/git-apply.txt:134
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unidiff-zero"
msgstr "--unidiff-zero"
#. type: Plain text
#: en/git-apply.txt:141
-msgid ""
-"By default, 'git apply' expects that the patch being applied is a unified "
-"diff with at least one line of context. This provides good safety measures, "
-"but breaks down when applying a diff generated with `--unified=0`. To bypass "
-"these checks use `--unidiff-zero`."
+#, priority:100
+msgid "By default, 'git apply' expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with `--unified=0`. To bypass these checks use `--unidiff-zero`."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:144
-msgid ""
-"Note, for the reasons stated above usage of context-free patches is "
-"discouraged."
+#, priority:100
+msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
-#, no-wrap
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
#. type: Plain text
#: en/git-apply.txt:151
-msgid ""
-"If you use any of the options marked \"Turns off 'apply'\" above, 'git "
-"apply' reads and outputs the requested information without actually applying "
-"the patch. Give this flag after those flags to also apply the patch."
+#, priority:100
+msgid "If you use any of the options marked \"Turns off 'apply'\" above, 'git apply' reads and outputs the requested information without actually applying the patch. Give this flag after those flags to also apply the patch."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:152
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-add"
msgstr "--no-add"
#. type: Plain text
#: en/git-apply.txt:158
-msgid ""
-"When applying a patch, ignore additions made by the patch. This can be used "
-"to extract the common part between two files by first running 'diff' on them "
-"and applying the result with this option, which would apply the deletion "
-"part but not the addition part."
+#, priority:100
+msgid "When applying a patch, ignore additions made by the patch. This can be used to extract the common part between two files by first running 'diff' on them and applying the result with this option, which would apply the deletion part but not the addition part."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:159
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--allow-binary-replacement"
msgstr "--allow-binary-replacement"
#. type: Plain text
#: en/git-apply.txt:165
-msgid ""
-"Historically we did not allow binary patch applied without an explicit "
-"permission from the user, and this flag was the way to do so. Currently we "
-"always allow binary patch application, so this is a no-op."
+#, priority:100
+msgid "Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. Currently we always allow binary patch application, so this is a no-op."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:166
-#, no-wrap
+#, no-wrap, priority:100
msgid "--exclude=<path-pattern>"
msgstr ""
#. type: Plain text
#: en/git-apply.txt:170
-msgid ""
-"Don't apply changes to files matching the given path pattern. This can be "
-"useful when importing patchsets, where you want to exclude certain files or "
-"directories."
+#, priority:100
+msgid "Don't apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to exclude certain files or directories."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:171
-#, no-wrap
+#, no-wrap, priority:100
msgid "--include=<path-pattern>"
msgstr ""
#. type: Plain text
#: en/git-apply.txt:175
-msgid ""
-"Apply changes to files matching the given path pattern. This can be useful "
-"when importing patchsets, where you want to include certain files or "
-"directories."
+#, priority:100
+msgid "Apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to include certain files or directories."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:181
-msgid ""
-"When `--exclude` and `--include` patterns are used, they are examined in the "
-"order they appear on the command line, and the first match determines if a "
-"patch to each path is used. A patch to a path that does not match any "
-"include/exclude pattern is used by default if there is no include pattern on "
-"the command line, and ignored if there is any include pattern."
+#, priority:100
+msgid "When `--exclude` and `--include` patterns are used, they are examined in the order they appear on the command line, and the first match determines if a patch to each path is used. A patch to a path that does not match any include/exclude pattern is used by default if there is no include pattern on the command line, and ignored if there is any include pattern."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:189
-msgid ""
-"When applying a patch, ignore changes in whitespace in context lines if "
-"necessary. Context lines will preserve their whitespace, and they will not "
-"undergo whitespace fixing regardless of the value of the `--whitespace` "
-"option. New lines will still be fixed, though."
+#, priority:100
+msgid "When applying a patch, ignore changes in whitespace in context lines if necessary. Context lines will preserve their whitespace, and they will not undergo whitespace fixing regardless of the value of the `--whitespace` option. New lines will still be fixed, though."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:190
-#, no-wrap
+#, no-wrap, priority:100
msgid "--whitespace=<action>"
msgstr ""
#. type: Plain text
#: en/git-apply.txt:198
-msgid ""
-"When applying a patch, detect a new or modified line that has whitespace "
-"errors. What are considered whitespace errors is controlled by "
-"`core.whitespace` configuration. By default, trailing whitespaces "
-"(including lines that solely consist of whitespaces) and a space character "
-"that is immediately followed by a tab character inside the initial indent of "
-"the line are considered whitespace errors."
+#, priority:100
+msgid "When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:202
-msgid ""
-"By default, the command outputs warning messages but applies the patch. "
-"When `git-apply` is used for statistics and not applying a patch, it "
-"defaults to `nowarn`."
+#, priority:100
+msgid "By default, the command outputs warning messages but applies the patch. When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:205
+#, priority:100
msgid "You can use different `<action>` values to control this behavior:"
msgstr ""
#. type: Plain text
#: en/git-apply.txt:207
+#, priority:100
msgid "`nowarn` turns off the trailing whitespace warning."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:209
-msgid ""
-"`warn` outputs warnings for a few such errors, but applies the patch as-is "
-"(default)."
+#, priority:100
+msgid "`warn` outputs warnings for a few such errors, but applies the patch as-is (default)."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:213
-msgid ""
-"`fix` outputs warnings for a few such errors, and applies the patch after "
-"fixing them (`strip` is a synonym --- the tool used to consider only "
-"trailing whitespace characters as errors, and the fix involved 'stripping' "
-"them, but modern Gits do more)."
+#, priority:100
+msgid "`fix` outputs warnings for a few such errors, and applies the patch after fixing them (`strip` is a synonym --- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more)."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:215
-msgid ""
-"`error` outputs warnings for a few such errors, and refuses to apply the "
-"patch."
+#, priority:100
+msgid "`error` outputs warnings for a few such errors, and refuses to apply the patch."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:216
+#, priority:100
msgid "`error-all` is similar to `error` but shows all errors."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:217
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--inaccurate-eof"
msgstr "--inaccurate-eof"
#. type: Plain text
#: en/git-apply.txt:223
-msgid ""
-"Under certain circumstances, some versions of 'diff' do not correctly detect "
-"a missing new-line at the end of the file. As a result, patches created by "
-"such 'diff' programs do not record incomplete lines correctly. This option "
-"adds support for applying such patches by working around this bug."
+#, priority:100
+msgid "Under certain circumstances, some versions of 'diff' do not correctly detect a missing new-line at the end of the file. As a result, patches created by such 'diff' programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:229
-msgid ""
-"Report progress to stderr. By default, only a message about the current "
-"patch being applied will be printed. This option will cause additional "
-"information to be reported."
+#, priority:100
+msgid "Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:230
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--recount"
msgstr "--recount"
#. type: Plain text
#: en/git-apply.txt:234
-msgid ""
-"Do not trust the line counts in the hunk headers, but infer them by "
-"inspecting the patch (e.g. after editing the patch without adjusting the "
-"hunk headers appropriately)."
+#, priority:100
+msgid "Do not trust the line counts in the hunk headers, but infer them by inspecting the patch (e.g. after editing the patch without adjusting the hunk headers appropriately)."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:235
-#, no-wrap
+#, no-wrap, priority:100
msgid "--directory=<root>"
msgstr ""
#. type: Plain text
#: en/git-apply.txt:238
-msgid ""
-"Prepend <root> to all filenames. If a \"-p\" argument was also passed, it "
-"is applied before prepending the new root."
+#, priority:100
+msgid "Prepend <root> to all filenames. If a \"-p\" argument was also passed, it is applied before prepending the new root."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:242
-msgid ""
-"For example, a patch that talks about updating `a/git-gui.sh` to "
-"`b/git-gui.sh` can be applied to the file in the working tree "
-"`modules/git-gui/git-gui.sh` by running `git apply "
-"--directory=modules/git-gui`."
+#, priority:100
+msgid "For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by running `git apply --directory=modules/git-gui`."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:243
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unsafe-paths"
msgstr "--unsafe-paths"
#. type: Plain text
#: en/git-apply.txt:248
-msgid ""
-"By default, a patch that affects outside the working area (either a Git "
-"controlled working tree, or the current working directory when \"git apply\" "
-"is used as a replacement of GNU patch) is rejected as a mistake (or a "
-"mischief)."
+#, priority:100
+msgid "By default, a patch that affects outside the working area (either a Git controlled working tree, or the current working directory when \"git apply\" is used as a replacement of GNU patch) is rejected as a mistake (or a mischief)."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:252
-msgid ""
-"When `git apply` is used as a \"better GNU patch\", the user can pass the "
-"`--unsafe-paths` option to override this safety check. This option has no "
-"effect when `--index` or `--cached` is in use."
+#, priority:100
+msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use."
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
-#, no-wrap
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:256
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "apply.ignoreWhitespace"
msgstr "apply.ignoreWhitespace"
#. type: Plain text
#: en/git-apply.txt:260
-msgid ""
-"Set to 'change' if you want changes in whitespace to be ignored by default. "
-"Set to one of: no, none, never, false if you want changes in whitespace to "
-"be significant."
+#, priority:100
+msgid "Set to 'change' if you want changes in whitespace to be ignored by default. Set to one of: no, none, never, false if you want changes in whitespace to be significant."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:260
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "apply.whitespace"
msgstr "apply.whitespace"
#. type: Plain text
#: en/git-apply.txt:263
-msgid ""
-"When no `--whitespace` flag is given from the command line, this "
-"configuration item is used as the default."
+#, priority:100
+msgid "When no `--whitespace` flag is given from the command line, this configuration item is used as the default."
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
-#, no-wrap
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
+#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
#. type: Plain text
#: en/git-apply.txt:268
-msgid ""
-"If the patch contains any changes to submodules then 'git apply' treats "
-"these changes as follows."
+#, priority:100
+msgid "If the patch contains any changes to submodules then 'git apply' treats these changes as follows."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:274
-msgid ""
-"If `--index` is specified (explicitly or implicitly), then the submodule "
-"commits must match the index exactly for the patch to apply. If any of the "
-"submodules are checked-out, then these check-outs are completely ignored, "
-"i.e., they are not required to be up to date or clean and they are not "
-"updated."
+#, priority:100
+msgid "If `--index` is specified (explicitly or implicitly), then the submodule commits must match the index exactly for the patch to apply. If any of the submodules are checked-out, then these check-outs are completely ignored, i.e., they are not required to be up to date or clean and they are not updated."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:278
-msgid ""
-"If `--index` is not specified, then the submodule commits in the patch are "
-"ignored and only the absence or presence of the corresponding subdirectory "
-"is checked and (if possible) updated."
+#, priority:100
+msgid "If `--index` is not specified, then the submodule commits in the patch are ignored and only the absence or presence of the corresponding subdirectory is checked and (if possible) updated."
msgstr ""
#. type: Plain text
@@ -8552,19 +7384,19 @@ msgstr "linkgit:git-am[1]."
#. type: Title =
#: en/git-archimport.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-archimport(1)"
msgstr "git-archimport(1)"
#. type: Plain text
#: en/git-archimport.txt:7
+#, priority:100
msgid "git-archimport - Import a GNU Arch repository into Git"
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\n"
" <archive/branch>[:<git-branch>] ...\n"
@@ -8572,197 +7404,163 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:23
-msgid ""
-"Imports a project from one or more GNU Arch repositories. It will follow "
-"branches and repositories within the namespaces defined by the "
-"<archive/branch> parameters supplied. If it cannot find the remote branch a "
-"merge comes from it will just import it as a regular commit. If it can find "
-"it, it will mark it as a merge whenever possible (see discussion below)."
+#, priority:100
+msgid "Imports a project from one or more GNU Arch repositories. It will follow branches and repositories within the namespaces defined by the <archive/branch> parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below)."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:27
-msgid ""
-"The script expects you to provide the key roots where it can start the "
-"import from an 'initial import' or 'tag' type of Arch commit. It will follow "
-"and import new branches within the provided roots."
+#, priority:100
+msgid "The script expects you to provide the key roots where it can start the import from an 'initial import' or 'tag' type of Arch commit. It will follow and import new branches within the provided roots."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:32
-msgid ""
-"It expects to be dealing with one project only. If it sees branches that "
-"have different roots, it will refuse to run. In that case, edit your "
-"<archive/branch> parameters to define clearly the scope of the import."
+#, priority:100
+msgid "It expects to be dealing with one project only. If it sees branches that have different roots, it will refuse to run. In that case, edit your <archive/branch> parameters to define clearly the scope of the import."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:37
-msgid ""
-"'git archimport' uses `tla` extensively in the background to access the Arch "
-"repository. Make sure you have a recent version of `tla` available in the "
-"path. `tla` must know about the repositories you pass to 'git archimport'."
+#, priority:100
+msgid "'git archimport' uses `tla` extensively in the background to access the Arch repository. Make sure you have a recent version of `tla` available in the path. `tla` must know about the repositories you pass to 'git archimport'."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:42
-msgid ""
-"For the initial import, 'git archimport' expects to find itself in an empty "
-"directory. To follow the development of a project that uses Arch, rerun 'git "
-"archimport' with the same parameters as the initial import to perform "
-"incremental imports."
+#, priority:100
+msgid "For the initial import, 'git archimport' expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun 'git archimport' with the same parameters as the initial import to perform incremental imports."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:49
-msgid ""
-"While 'git archimport' will try to create sensible branch names for the "
-"archives that it imports, it is also possible to specify Git branch names "
-"manually. To do so, write a Git branch name after each <archive/branch> "
-"parameter, separated by a colon. This way, you can shorten the Arch branch "
-"names and convert Arch jargon to Git jargon, for example mapping a "
-"\"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"."
+#, priority:100
+msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:54
-msgid ""
-"Associating multiple Arch branches to one Git branch is possible; the result "
-"will make the most sense only if no commits are made to the first branch, "
-"after the second branch is created. Still, this is useful to convert Arch "
-"repositories that had been rotated periodically."
+#, priority:100
+msgid "Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically."
msgstr ""
#. type: Title -
#: en/git-archimport.txt:57
-#, no-wrap
+#, no-wrap, priority:100
msgid "MERGES"
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:63
-msgid ""
-"Patch merge data from Arch is used to mark merges in Git as well. Git does "
-"not care much about tracking patches, and only considers a merge when a "
-"branch incorporates all the commits since the point they forked. The end "
-"result is that Git will have a good idea of how far branches have "
-"diverged. So the import process does lose some patch-trading metadata."
+#, priority:100
+msgid "Patch merge data from Arch is used to mark merges in Git as well. Git does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result is that Git will have a good idea of how far branches have diverged. So the import process does lose some patch-trading metadata."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:67
-msgid ""
-"Fortunately, when you try and merge branches imported from Arch, Git will "
-"find a good merge base, and it has a good chance of identifying patches that "
-"have been traded out-of-sequence between the branches."
+#, priority:100
+msgid "Fortunately, when you try and merge branches imported from Arch, Git will find a good merge base, and it has a good chance of identifying patches that have been traded out-of-sequence between the branches."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:73
+#, priority:100
msgid "Display usage."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:76
+#, priority:100
msgid "Verbose output."
msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:77
-#, no-wrap
+#, no-wrap, priority:100
msgid "-T"
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:80
-msgid ""
-"Many tags. Will create a tag for every commit, reflecting the commit name in "
-"the Arch repository."
+#, priority:100
+msgid "Many tags. Will create a tag for every commit, reflecting the commit name in the Arch repository."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:85
-msgid ""
-"Use the fast patchset import strategy. This can be significantly faster for "
-"large trees, but cannot handle directory renames or permissions changes. "
-"The default strategy is slow and safe."
+#, priority:100
+msgid "Use the fast patchset import strategy. This can be significantly faster for large trees, but cannot handle directory renames or permissions changes. The default strategy is slow and safe."
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
-#, no-wrap
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
#. type: Plain text
#: en/git-archimport.txt:93
-msgid ""
-"Use this for compatibility with old-style branch names used by earlier "
-"versions of 'git archimport'. Old-style branch names were "
-"category{litdd}branch, whereas new-style branch names are "
-"archive,category{litdd}branch{litdd}version. In both cases, names given on "
-"the command-line will override the automatically-generated ones."
+#, priority:100
+msgid "Use this for compatibility with old-style branch names used by earlier versions of 'git archimport'. Old-style branch names were category{litdd}branch, whereas new-style branch names are archive,category{litdd}branch{litdd}version. In both cases, names given on the command-line will override the automatically-generated ones."
msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:94
-#, no-wrap
+#, no-wrap, priority:100
msgid "-D <depth>"
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:98
-msgid ""
-"Follow merge ancestry and attempt to import trees that have been merged "
-"from. Specify a depth greater than 1 if patch logs have been pruned."
+#, priority:100
+msgid "Follow merge ancestry and attempt to import trees that have been merged from. Specify a depth greater than 1 if patch logs have been pruned."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:102
-msgid ""
-"Attempt to auto-register archives at `http://mirrors.sourcecontrol.net` This "
-"is particularly useful with the -D option."
+#, priority:100
+msgid "Attempt to auto-register archives at `http://mirrors.sourcecontrol.net` This is particularly useful with the -D option."
msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:103
-#, no-wrap
+#, no-wrap, priority:100
msgid "-t <tmpdir>"
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:105
+#, priority:100
msgid "Override the default tempdir."
msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:107
-#, no-wrap
+#, no-wrap, priority:100
msgid "<archive/branch>"
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:109
+#, priority:100
msgid "Archive/branch identifier in a format that `tla log` understands."
msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-archive(1)"
msgstr "git-archive(1)"
#. type: Plain text
#: en/git-archive.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-archive - Create an archive of files from a named tree"
msgstr "Crear un archivo o archivos de un 찼rbol nombrado"
#. type: Plain text
#: en/git-archive.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]\n"
"\t [-o <file> | --output=<file>] [--worktree-attributes]\n"
@@ -8772,402 +7570,350 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:23
-msgid ""
-"Creates an archive of the specified format containing the tree structure for "
-"the named tree, and writes it out to the standard output. If <prefix> is "
-"specified it is prepended to the filenames in the archive."
+#, priority:100
+msgid "Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If <prefix> is specified it is prepended to the filenames in the archive."
msgstr ""
#. type: Plain text
#: en/git-archive.txt:32
-msgid ""
-"'git archive' behaves differently when given a tree ID versus when given a "
-"commit ID or tag ID. In the first case the current time is used as the "
-"modification time of each file in the archive. In the latter case the "
-"commit time as recorded in the referenced commit object is used instead. "
-"Additionally the commit ID is stored in a global extended pax header if the "
-"tar format is used; it can be extracted using 'git get-tar-commit-id'. In "
-"ZIP files it is stored as a file comment."
+#, priority:100
+msgid "'git archive' behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as the modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using 'git get-tar-commit-id'. In ZIP files it is stored as a file comment."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:36
-#, no-wrap
+#, no-wrap, priority:100
msgid "--format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:42
-msgid ""
-"Format of the resulting archive: 'tar' or 'zip'. If this option is not "
-"given, and the output file is specified, the format is inferred from the "
-"filename if possible (e.g. writing to \"foo.zip\" makes the output to be in "
-"the zip format). Otherwise the output format is `tar`."
+#, priority:100
+msgid "Format of the resulting archive: 'tar' or 'zip'. If this option is not given, and the output file is specified, the format is inferred from the filename if possible (e.g. writing to \"foo.zip\" makes the output to be in the zip format). Otherwise the output format is `tar`."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--list"
msgstr "--list"
#. type: Plain text
#: en/git-archive.txt:46
+#, priority:100
msgid "Show all available formats."
msgstr ""
#. type: Plain text
#: en/git-archive.txt:50
+#, priority:100
msgid "Report progress to stderr."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:51 en/git-write-tree.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid "--prefix=<prefix>/"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:53
-#, fuzzy
+#, fuzzy, priority:100
msgid "Prepend <prefix>/ to each filename in the archive."
msgstr "anteponer prefijo a cada ruta en el archivo"
#. type: Labeled list
#: en/git-archive.txt:54
-#, no-wrap
+#, no-wrap, priority:100
msgid "-o <file>"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:57
+#, priority:100
msgid "Write the archive to <file> instead of stdout."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
#. type: Plain text
#: en/git-archive.txt:61
-msgid ""
-"Look for attributes in .gitattributes files in the working tree as well (see "
-"<<ATTRIBUTES>>)."
+#, priority:100
+msgid "Look for attributes in .gitattributes files in the working tree as well (see <<ATTRIBUTES>>)."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:62
-#, no-wrap
+#, no-wrap, priority:100
msgid "<extra>"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:65
-msgid ""
-"This can be any options that the archiver backend understands. See next "
-"section."
+#, priority:100
+msgid "This can be any options that the archiver backend understands. See next section."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:66
-#, no-wrap
+#, no-wrap, priority:100
msgid "--remote=<repo>"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:72
-msgid ""
-"Instead of making a tar archive from the local repository, retrieve a tar "
-"archive from a remote repository. Note that the remote repository may place "
-"restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See "
-"linkgit:git-upload-archive[1] for details."
+#, priority:100
+msgid "Instead of making a tar archive from the local repository, retrieve a tar archive from a remote repository. Note that the remote repository may place restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See linkgit:git-upload-archive[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:73
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--exec=<git-upload-archive>"
msgstr "--exec=<git-upload-archive>"
#. type: Plain text
#: en/git-archive.txt:76
-msgid ""
-"Used with --remote to specify the path to the 'git-upload-archive' on the "
-"remote side."
+#, priority:100
+msgid "Used with --remote to specify the path to the 'git-upload-archive' on the remote side."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
-#, fuzzy, no-wrap
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
+#, fuzzy, no-wrap, priority:240
msgid "<tree-ish>"
msgstr "찼rbol-ismo"
#. type: Plain text
#: en/git-archive.txt:79
+#, priority:100
msgid "The tree or commit to produce an archive for."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:80
-#, no-wrap
+#, no-wrap, priority:100
msgid "<path>"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:84
-msgid ""
-"Without an optional path parameter, all files and subdirectories of the "
-"current working directory are included in the archive. If one or more paths "
-"are specified, only these are included."
+#, priority:100
+msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included."
msgstr ""
#. type: Title -
#: en/git-archive.txt:86
-#, no-wrap
+#, no-wrap, priority:100
msgid "BACKEND EXTRA OPTIONS"
msgstr ""
#. type: Title ~
#: en/git-archive.txt:89
-#, no-wrap
+#, no-wrap, priority:100
msgid "zip"
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "-0"
msgstr "-0"
#. type: Plain text
#: en/git-archive.txt:92
+#, priority:100
msgid "Store the files instead of deflating them."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:92
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "-9"
msgstr "-9"
#. type: Plain text
#: en/git-archive.txt:95
-msgid ""
-"Highest and slowest compression level. You can specify any number from 1 to "
-"9 to adjust compression speed and ratio."
+#, priority:100
+msgid "Highest and slowest compression level. You can specify any number from 1 to 9 to adjust compression speed and ratio."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:100
-#, no-wrap
+#, no-wrap, priority:100
msgid "tar.umask"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:107
-msgid ""
-"This variable can be used to restrict the permission bits of tar archive "
-"entries. The default is 0002, which turns off the world write bit. The "
-"special value \"user\" indicates that the archiving user's umask will be "
-"used instead. See umask(2) for details. If `--remote` is used then only "
-"the configuration of the remote repository takes effect."
+#, priority:100
+msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:108
-#, no-wrap
+#, no-wrap, priority:100
msgid "tar.<format>.command"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:117
-msgid ""
-"This variable specifies a shell command through which the tar output "
-"generated by `git archive` should be piped. The command is executed using "
-"the shell with the generated tar file on its standard input, and should "
-"produce the final output on its standard output. Any compression-level "
-"options will be passed to the command (e.g., \"-9\"). An output file with "
-"the same extension as `<format>` will be use this format if no other format "
-"is given."
+#, priority:100
+msgid "This variable specifies a shell command through which the tar output generated by `git archive` should be piped. The command is executed using the shell with the generated tar file on its standard input, and should produce the final output on its standard output. Any compression-level options will be passed to the command (e.g., \"-9\"). An output file with the same extension as `<format>` will be use this format if no other format is given."
msgstr ""
#. type: Plain text
#: en/git-archive.txt:120
-msgid ""
-"The \"tar.gz\" and \"tgz\" formats are defined automatically and default to "
-"`gzip -cn`. You may override them with custom commands."
+#, priority:100
+msgid "The \"tar.gz\" and \"tgz\" formats are defined automatically and default to `gzip -cn`. You may override them with custom commands."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:121
-#, no-wrap
+#, no-wrap, priority:100
msgid "tar.<format>.remote"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:126
-msgid ""
-"If true, enable `<format>` for use by remote clients via "
-"linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, "
-"but true for the \"tar.gz\" and \"tgz\" formats."
+#, priority:100
+msgid "If true, enable `<format>` for use by remote clients via linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, but true for the \"tar.gz\" and \"tgz\" formats."
msgstr ""
#. type: Title -
#: en/git-archive.txt:129
-#, no-wrap
+#, no-wrap, priority:100
msgid "ATTRIBUTES"
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:131
-#, no-wrap
+#, no-wrap, priority:100
msgid "export-ignore"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:134
-msgid ""
-"Files and directories with the attribute export-ignore won't be added to "
-"archive files. See linkgit:gitattributes[5] for details."
+#, priority:100
+msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:135
-#, no-wrap
+#, no-wrap, priority:100
msgid "export-subst"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:139
-msgid ""
-"If the attribute export-subst is set for a file then Git will expand several "
-"placeholders when adding this file to an archive. See "
-"linkgit:gitattributes[5] for details."
+#, priority:100
+msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Plain text
#: en/git-archive.txt:147
-msgid ""
-"Note that attributes are by default taken from the `.gitattributes` files in "
-"the tree that is being archived. If you want to tweak the way the output is "
-"generated after the fact (e.g. you committed without adding an appropriate "
-"export-ignore in its `.gitattributes`), adjust the checked out "
-"`.gitattributes` file as necessary and use `--worktree-attributes` option. "
-"Alternatively you can keep necessary attributes that should apply while "
-"archiving any tree in your `$GIT_DIR/info/attributes` file."
+#, priority:100
+msgid "Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out `.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:150
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:155
-msgid ""
-"Create a tar archive that contains the contents of the latest commit on the "
-"current branch, and extract it in the `/var/tmp/junk` directory."
+#, priority:100
+msgid "Create a tar archive that contains the contents of the latest commit on the current branch, and extract it in the `/var/tmp/junk` directory."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:156
-#, no-wrap
-msgid ""
-"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip "
-">git-1.4.0.tar.gz`"
+#, no-wrap, priority:100
+msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:159
+#, priority:100
msgid "Create a compressed tarball for v1.4.0 release."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:160
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:163
+#, priority:100
msgid "Same as above, but using the builtin tar.gz handling."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:164
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0`"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:167
+#, priority:100
msgid "Same as above, but the format is inferred from the output file."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:168
-#, no-wrap
-msgid ""
-"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip "
-">git-1.4.0.tar.gz`"
+#, no-wrap, priority:100
+msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:172
-msgid ""
-"Create a compressed tarball for v1.4.0 release, but without a global "
-"extended pax header."
+#, priority:100
+msgid "Create a compressed tarball for v1.4.0 release, but without a global extended pax header."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:173
-#, no-wrap
-msgid ""
-"`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > "
-"git-1.4.0-docs.zip`"
+#, no-wrap, priority:100
+msgid "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-docs.zip`"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:177
-msgid ""
-"Put everything in the current head's Documentation/ directory into "
-"'git-1.4.0-docs.zip', with the prefix 'git-docs/'."
+#, priority:100
+msgid "Put everything in the current head's Documentation/ directory into 'git-1.4.0-docs.zip', with the prefix 'git-docs/'."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:178
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git archive -o latest.zip HEAD`"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:183
-msgid ""
-"Create a Zip archive that contains the contents of the latest commit on the "
-"current branch. Note that the output format is inferred by the extension of "
-"the output file."
+#, priority:100
+msgid "Create a Zip archive that contains the contents of the latest commit on the current branch. Note that the output format is inferred by the extension of the output file."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:184
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git config tar.tar.xz.command \"xz -c\"`"
msgstr ""
#. type: Plain text
#: en/git-archive.txt:189
-msgid ""
-"Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can "
-"use it specifying `--format=tar.xz`, or by creating an output file like `-o "
-"foo.tar.xz`."
+#, priority:100
+msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`."
msgstr ""
#. type: Plain text
@@ -9178,33 +7924,31 @@ msgstr "linkgit:gitattributes[5]"
#. type: Title =
#: en/git-bisect.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-bisect(1)"
msgstr "git-bisect(1)"
#. type: Plain text
#: en/git-bisect.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-bisect - Use binary search to find the commit that introduced a bug"
msgstr "Use la b첬squeda binaria para encontrar el commit que introdujo el bug"
#. type: Plain text
#: en/git-bisect.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git bisect' <subcommand> <options>\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:18 en/git-reflog.txt:18
-msgid ""
-"The command takes various subcommands, and different options depending on "
-"the subcommand:"
+#, priority:100
+msgid "The command takes various subcommands, and different options depending on the subcommand:"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:31
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]\n"
"\t\t [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]\n"
@@ -9222,44 +7966,31 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:40
-msgid ""
-"This command uses a binary search algorithm to find which commit in your "
-"project's history introduced a bug. You use it by first telling it a \"bad\" "
-"commit that is known to contain the bug, and a \"good\" commit that is known "
-"to be before the bug was introduced. Then `git bisect` picks a commit "
-"between those two endpoints and asks you whether the selected commit is "
-"\"good\" or \"bad\". It continues narrowing down the range until it finds "
-"the exact commit that introduced the change."
+#, priority:100
+msgid "This command uses a binary search algorithm to find which commit in your project's history introduced a bug. You use it by first telling it a \"bad\" commit that is known to contain the bug, and a \"good\" commit that is known to be before the bug was introduced. Then `git bisect` picks a commit between those two endpoints and asks you whether the selected commit is \"good\" or \"bad\". It continues narrowing down the range until it finds the exact commit that introduced the change."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:47
-msgid ""
-"In fact, `git bisect` can be used to find the commit that changed *any* "
-"property of your project; e.g., the commit that fixed a bug, or the commit "
-"that caused a benchmark's performance to improve. To support this more "
-"general usage, the terms \"old\" and \"new\" can be used in place of "
-"\"good\" and \"bad\", or you can choose your own terms. See section "
-"\"Alternate terms\" below for more information."
+#, priority:100
+msgid "In fact, `git bisect` can be used to find the commit that changed *any* property of your project; e.g., the commit that fixed a bug, or the commit that caused a benchmark's performance to improve. To support this more general usage, the terms \"old\" and \"new\" can be used in place of \"good\" and \"bad\", or you can choose your own terms. See section \"Alternate terms\" below for more information."
msgstr ""
#. type: Title ~
#: en/git-bisect.txt:49
-#, no-wrap
+#, no-wrap, priority:100
msgid "Basic bisect commands: start, bad, good"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:54
-msgid ""
-"As an example, suppose you are trying to find the commit that broke a "
-"feature that was known to work in version `v2.6.13-rc2` of your project. You "
-"start a bisect session as follows:"
+#, priority:100
+msgid "As an example, suppose you are trying to find the commit that broke a feature that was known to work in version `v2.6.13-rc2` of your project. You start a bisect session as follows:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:59
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git bisect start\n"
"$ git bisect bad # Current version is bad\n"
@@ -9268,310 +7999,277 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:64
-msgid ""
-"Once you have specified at least one bad and one good commit, `git bisect` "
-"selects a commit in the middle of that range of history, checks it out, and "
-"outputs something similar to the following:"
+#, priority:100
+msgid "Once you have specified at least one bad and one good commit, `git bisect` selects a commit in the middle of that range of history, checks it out, and outputs something similar to the following:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:67
-#, no-wrap
+#, no-wrap, priority:100
msgid "Bisecting: 675 revisions left to test after this (roughly 10 steps)\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:71
-msgid ""
-"You should now compile the checked-out version and test it. If that version "
-"works correctly, type"
+#, priority:100
+msgid "You should now compile the checked-out version and test it. If that version works correctly, type"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:74
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect good\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:77
+#, priority:100
msgid "If that version is broken, type"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:80
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect bad\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:83
+#, priority:100
msgid "Then `git bisect` will respond with something like"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:86
-#, no-wrap
+#, no-wrap, priority:100
msgid "Bisecting: 337 revisions left to test after this (roughly 9 steps)\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:91
-msgid ""
-"Keep repeating the process: compile the tree, test it, and depending on "
-"whether it is good or bad run `git bisect good` or `git bisect bad` to ask "
-"for the next commit that needs testing."
+#, priority:100
+msgid "Keep repeating the process: compile the tree, test it, and depending on whether it is good or bad run `git bisect good` or `git bisect bad` to ask for the next commit that needs testing."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:95
-msgid ""
-"Eventually there will be no more revisions left to inspect, and the command "
-"will print out a description of the first bad commit. The reference "
-"`refs/bisect/bad` will be left pointing at that commit."
+#, priority:100
+msgid "Eventually there will be no more revisions left to inspect, and the command will print out a description of the first bad commit. The reference `refs/bisect/bad` will be left pointing at that commit."
msgstr ""
#. type: Title ~
#: en/git-bisect.txt:98
-#, no-wrap
+#, no-wrap, priority:100
msgid "Bisect reset"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:102
-msgid ""
-"After a bisect session, to clean up the bisection state and return to the "
-"original HEAD, issue the following command:"
+#, priority:100
+msgid "After a bisect session, to clean up the bisection state and return to the original HEAD, issue the following command:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:105
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect reset\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:110
-msgid ""
-"By default, this will return your tree to the commit that was checked out "
-"before `git bisect start`. (A new `git bisect start` will also do that, as "
-"it cleans up the old bisection state.)"
+#, priority:100
+msgid "By default, this will return your tree to the commit that was checked out before `git bisect start`. (A new `git bisect start` will also do that, as it cleans up the old bisection state.)"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:113
+#, priority:100
msgid "With an optional argument, you can return to a different commit instead:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:116
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect reset <commit>\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:121
-msgid ""
-"For example, `git bisect reset bisect/bad` will check out the first bad "
-"revision, while `git bisect reset HEAD` will leave you on the current "
-"bisection commit and avoid switching commits at all."
+#, priority:100
+msgid "For example, `git bisect reset bisect/bad` will check out the first bad revision, while `git bisect reset HEAD` will leave you on the current bisection commit and avoid switching commits at all."
msgstr ""
#. type: Title ~
#: en/git-bisect.txt:124
-#, no-wrap
+#, no-wrap, priority:100
msgid "Alternate terms"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:132
-msgid ""
-"Sometimes you are not looking for the commit that introduced a breakage, but "
-"rather for a commit that caused a change between some other \"old\" state "
-"and \"new\" state. For example, you might be looking for the commit that "
-"introduced a particular fix. Or you might be looking for the first commit in "
-"which the source-code filenames were finally all converted to your company's "
-"naming standard. Or whatever."
+#, priority:100
+msgid "Sometimes you are not looking for the commit that introduced a breakage, but rather for a commit that caused a change between some other \"old\" state and \"new\" state. For example, you might be looking for the commit that introduced a particular fix. Or you might be looking for the first commit in which the source-code filenames were finally all converted to your company's naming standard. Or whatever."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:138
-msgid ""
-"In such cases it can be very confusing to use the terms \"good\" and \"bad\" "
-"to refer to \"the state before the change\" and \"the state after the "
-"change\". So instead, you can use the terms \"old\" and \"new\", "
-"respectively, in place of \"good\" and \"bad\". (But note that you cannot "
-"mix \"good\" and \"bad\" with \"old\" and \"new\" in a single session.)"
+#, priority:100
+msgid "In such cases it can be very confusing to use the terms \"good\" and \"bad\" to refer to \"the state before the change\" and \"the state after the change\". So instead, you can use the terms \"old\" and \"new\", respectively, in place of \"good\" and \"bad\". (But note that you cannot mix \"good\" and \"bad\" with \"old\" and \"new\" in a single session.)"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:145
-msgid ""
-"In this more general usage, you provide `git bisect` with a \"new\" commit "
-"that has some property and an \"old\" commit that doesn't have that "
-"property. Each time `git bisect` checks out a commit, you test if that "
-"commit has the property. If it does, mark the commit as \"new\"; otherwise, "
-"mark it as \"old\". When the bisection is done, `git bisect` will report "
-"which commit introduced the property."
+#, priority:100
+msgid "In this more general usage, you provide `git bisect` with a \"new\" commit that has some property and an \"old\" commit that doesn't have that property. Each time `git bisect` checks out a commit, you test if that commit has the property. If it does, mark the commit as \"new\"; otherwise, mark it as \"old\". When the bisection is done, `git bisect` will report which commit introduced the property."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:149
-msgid ""
-"To use \"old\" and \"new\" instead of \"good\" and bad, you must run `git "
-"bisect start` without commits as argument and then run the following "
-"commands to add the commits:"
+#, priority:100
+msgid "To use \"old\" and \"new\" instead of \"good\" and bad, you must run `git bisect start` without commits as argument and then run the following commands to add the commits:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:152
-#, no-wrap
+#, no-wrap, priority:100
msgid "git bisect old [<rev>]\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:155
+#, priority:100
msgid "to indicate that a commit was before the sought change, or"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:158
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git bisect new [<rev>...]\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:161
+#, priority:100
msgid "to indicate that it was after."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:163
+#, priority:100
msgid "To get a reminder of the currently used terms, use"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:166
-#, no-wrap
+#, no-wrap, priority:100
msgid "git bisect terms\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:170
-msgid ""
-"You can get just the old (respectively new) term with `git bisect terms "
-"--term-old` or `git bisect terms --term-good`."
+#, priority:100
+msgid "You can get just the old (respectively new) term with `git bisect terms --term-old` or `git bisect terms --term-good`."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:175
-msgid ""
-"If you would like to use your own terms instead of \"bad\"/\"good\" or "
-"\"new\"/\"old\", you can choose any names you like (except existing bisect "
-"subcommands like `reset`, `start`, ...) by starting the bisection using"
+#, ignore-ellipsis, priority:100
+msgid "If you would like to use your own terms instead of \"bad\"/\"good\" or \"new\"/\"old\", you can choose any names you like (except existing bisect subcommands like `reset`, `start`, ...) by starting the bisection using"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:178
-#, no-wrap
+#, no-wrap, priority:100
msgid "git bisect start --term-old <term-old> --term-new <term-new>\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:182
-msgid ""
-"For example, if you are looking for a commit that introduced a performance "
-"regression, you might use"
+#, priority:100
+msgid "For example, if you are looking for a commit that introduced a performance regression, you might use"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:185
-#, no-wrap
+#, no-wrap, priority:100
msgid "git bisect start --term-old fast --term-new slow\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:188
+#, priority:100
msgid "Or if you are looking for the commit that fixed a bug, you might use"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:191
-#, no-wrap
+#, no-wrap, priority:100
msgid "git bisect start --term-new fixed --term-old broken\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:195
-msgid ""
-"Then, use `git bisect <term-old>` and `git bisect <term-new>` instead of "
-"`git bisect good` and `git bisect bad` to mark commits."
+#, priority:100
+msgid "Then, use `git bisect <term-old>` and `git bisect <term-new>` instead of `git bisect good` and `git bisect bad` to mark commits."
msgstr ""
#. type: Title ~
#: en/git-bisect.txt:197
-#, no-wrap
+#, no-wrap, priority:100
msgid "Bisect visualize/view"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:202
-msgid ""
-"To see the currently remaining suspects in 'gitk', issue the following "
-"command during the bisection process (the subcommand `view` can be used as "
-"an alternative to `visualize`):"
+#, priority:100
+msgid "To see the currently remaining suspects in 'gitk', issue the following command during the bisection process (the subcommand `view` can be used as an alternative to `visualize`):"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:205
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect visualize\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:210
-msgid ""
-"If the `DISPLAY` environment variable is not set, 'git log' is used "
-"instead. You can also give command-line options such as `-p` and `--stat`."
+#, priority:100
+msgid "If the `DISPLAY` environment variable is not set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`."
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:213
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect visualize --stat\n"
msgstr ""
#. type: Title ~
#: en/git-bisect.txt:216
-#, no-wrap
+#, no-wrap, priority:100
msgid "Bisect log and bisect replay"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:220
-msgid ""
-"After having marked revisions as good or bad, issue the following command to "
-"show what has been done so far:"
+#, priority:100
+msgid "After having marked revisions as good or bad, issue the following command to show what has been done so far:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:223
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect log\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:229
-msgid ""
-"If you discover that you made a mistake in specifying the status of a "
-"revision, you can save the output of this command to a file, edit it to "
-"remove the incorrect entries, and then issue the following commands to "
-"return to a corrected state:"
+#, priority:100
+msgid "If you discover that you made a mistake in specifying the status of a revision, you can save the output of this command to a file, edit it to remove the incorrect entries, and then issue the following commands to return to a corrected state:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:233
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git bisect reset\n"
"$ git bisect replay that-file\n"
@@ -9579,27 +8277,25 @@ msgstr ""
#. type: Title ~
#: en/git-bisect.txt:236
-#, no-wrap
+#, no-wrap, priority:100
msgid "Avoiding testing a commit"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:243
-msgid ""
-"If, in the middle of a bisect session, you know that the suggested revision "
-"is not a good one to test (e.g. it fails to build and you know that the "
-"failure does not have anything to do with the bug you are chasing), you can "
-"manually select a nearby commit and test that one instead."
+#, priority:100
+msgid "If, in the middle of a bisect session, you know that the suggested revision is not a good one to test (e.g. it fails to build and you know that the failure does not have anything to do with the bug you are chasing), you can manually select a nearby commit and test that one instead."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:245 en/git-tag.txt:373
+#, priority:240
msgid "For example:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:252
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git bisect good/bad\t\t\t# previous round was good or bad.\n"
"Bisecting: 337 revisions left to test after this (roughly 9 steps)\n"
@@ -9610,108 +8306,97 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:256
-msgid ""
-"Then compile and test the chosen revision, and afterwards mark the revision "
-"as good or bad in the usual manner."
+#, priority:100
+msgid "Then compile and test the chosen revision, and afterwards mark the revision as good or bad in the usual manner."
msgstr ""
#. type: Title ~
#: en/git-bisect.txt:258
-#, no-wrap
+#, no-wrap, priority:100
msgid "Bisect skip"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:262
-msgid ""
-"Instead of choosing a nearby commit by yourself, you can ask Git to do it "
-"for you by issuing the command:"
+#, priority:100
+msgid "Instead of choosing a nearby commit by yourself, you can ask Git to do it for you by issuing the command:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:265
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect skip # Current version cannot be tested\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:270
-msgid ""
-"However, if you skip a commit adjacent to the one you are looking for, Git "
-"will be unable to tell exactly which of those commits was the first bad one."
+#, priority:100
+msgid "However, if you skip a commit adjacent to the one you are looking for, Git will be unable to tell exactly which of those commits was the first bad one."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:273
-msgid ""
-"You can also skip a range of commits, instead of just one commit, using "
-"range notation. For example:"
+#, priority:100
+msgid "You can also skip a range of commits, instead of just one commit, using range notation. For example:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:276
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect skip v2.5..v2.6\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:280
-msgid ""
-"This tells the bisect process that no commit after `v2.5`, up to and "
-"including `v2.6`, should be tested."
+#, priority:100
+msgid "This tells the bisect process that no commit after `v2.5`, up to and including `v2.6`, should be tested."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:283
-msgid ""
-"Note that if you also want to skip the first commit of the range you would "
-"issue the command:"
+#, priority:100
+msgid "Note that if you also want to skip the first commit of the range you would issue the command:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:286
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect skip v2.5 v2.5..v2.6\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:290
-msgid ""
-"This tells the bisect process that the commits between `v2.5` and `v2.6` "
-"(inclusive) should be skipped."
+#, priority:100
+msgid "This tells the bisect process that the commits between `v2.5` and `v2.6` (inclusive) should be skipped."
msgstr ""
#. type: Title ~
#: en/git-bisect.txt:293
-#, no-wrap
+#, no-wrap, priority:100
msgid "Cutting down bisection by giving more parameters to bisect start"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:298
-msgid ""
-"You can further cut down the number of trials, if you know what part of the "
-"tree is involved in the problem you are tracking down, by specifying path "
-"parameters when issuing the `bisect start` command:"
+#, priority:100
+msgid "You can further cut down the number of trials, if you know what part of the tree is involved in the problem you are tracking down, by specifying path parameters when issuing the `bisect start` command:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:301
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect start -- arch/i386 include/asm-i386\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:306
-msgid ""
-"If you know beforehand more than one good commit, you can narrow the bisect "
-"space down by specifying all of the good commits immediately after the bad "
-"commit when issuing the `bisect start` command:"
+#, priority:100
+msgid "If you know beforehand more than one good commit, you can narrow the bisect space down by specifying all of the good commits immediately after the bad commit when issuing the `bisect start` command:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:311
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git bisect start v2.6.20-rc6 v2.6.20-rc4 v2.6.20-rc1 --\n"
" # v2.6.20-rc6 is bad\n"
@@ -9720,108 +8405,85 @@ msgstr ""
#. type: Title ~
#: en/git-bisect.txt:314
-#, no-wrap
+#, no-wrap, priority:100
msgid "Bisect run"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:318
-msgid ""
-"If you have a script that can tell if the current source code is good or "
-"bad, you can bisect by issuing the command:"
+#, priority:100
+msgid "If you have a script that can tell if the current source code is good or bad, you can bisect by issuing the command:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:321
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect run my_script arguments\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:327
-msgid ""
-"Note that the script (`my_script` in the above example) should exit with "
-"code 0 if the current source code is good/old, and exit with a code between "
-"1 and 127 (inclusive), except 125, if the current source code is bad/new."
+#, priority:100
+msgid "Note that the script (`my_script` in the above example) should exit with code 0 if the current source code is good/old, and exit with a code between 1 and 127 (inclusive), except 125, if the current source code is bad/new."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:331
-msgid ""
-"Any other exit code will abort the bisect process. It should be noted that a "
-"program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) "
-"manual page), as the value is chopped with `& 0377`."
+#, priority:100
+msgid "Any other exit code will abort the bisect process. It should be noted that a program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) manual page), as the value is chopped with `& 0377`."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:340
-msgid ""
-"The special exit code 125 should be used when the current source code cannot "
-"be tested. If the script exits with this code, the current revision will be "
-"skipped (see `git bisect skip` above). 125 was chosen as the highest "
-"sensible value to use for this purpose, because 126 and 127 are used by "
-"POSIX shells to signal specific error status (127 is for command not found, "
-"126 is for command found but not executable--these details do not matter, as "
-"they are normal errors in the script, as far as `bisect run` is concerned)."
+#, priority:100
+msgid "The special exit code 125 should be used when the current source code cannot be tested. If the script exits with this code, the current revision will be skipped (see `git bisect skip` above). 125 was chosen as the highest sensible value to use for this purpose, because 126 and 127 are used by POSIX shells to signal specific error status (127 is for command not found, 126 is for command found but not executable--these details do not matter, as they are normal errors in the script, as far as `bisect run` is concerned)."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:346
-msgid ""
-"You may often find that during a bisect session you want to have temporary "
-"modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or "
-"\"revision that does not have this commit needs this patch applied to work "
-"around another problem this bisection is not interested in\") applied to the "
-"revision being tested."
+#, priority:100
+msgid "You may often find that during a bisect session you want to have temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or \"revision that does not have this commit needs this patch applied to work around another problem this bisection is not interested in\") applied to the revision being tested."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:354
-msgid ""
-"To cope with such a situation, after the inner 'git bisect' finds the next "
-"revision to test, the script can apply the patch before compiling, run the "
-"real test, and afterwards decide if the revision (possibly with the needed "
-"patch) passed the test and then rewind the tree to the pristine state. "
-"Finally the script should exit with the status of the real test to let the "
-"`git bisect run` command loop determine the eventual outcome of the bisect "
-"session."
+#, priority:100
+msgid "To cope with such a situation, after the inner 'git bisect' finds the next revision to test, the script can apply the patch before compiling, run the real test, and afterwards decide if the revision (possibly with the needed patch) passed the test and then rewind the tree to the pristine state. Finally the script should exit with the status of the real test to let the `git bisect run` command loop determine the eventual outcome of the bisect session."
msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:357 en/git-clone.txt:144
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--no-checkout"
msgstr "--no-checkout"
#. type: Plain text
#: en/git-bisect.txt:362
-msgid ""
-"Do not checkout the new working tree at each iteration of the bisection "
-"process. Instead just update a special reference named `BISECT_HEAD` to make "
-"it point to the commit that should be tested."
+#, priority:100
+msgid "Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named `BISECT_HEAD` to make it point to the commit that should be tested."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:365
-msgid ""
-"This option may be useful when the test you would perform in each step does "
-"not require a checked out tree."
+#, priority:100
+msgid "This option may be useful when the test you would perform in each step does not require a checked out tree."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:367
+#, priority:100
msgid "If the repository is bare, `--no-checkout` is assumed."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:372
+#, priority:100
msgid "Automatically bisect a broken build between v1.2 and HEAD:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:377
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good\n"
"$ git bisect run make # \"make\" builds the app\n"
@@ -9830,12 +8492,13 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:380
+#, priority:100
msgid "Automatically bisect a test failure between origin and HEAD:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:385
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD origin -- # HEAD is bad, origin is good\n"
"$ git bisect run make test # \"make test\" builds and tests\n"
@@ -9844,12 +8507,13 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:388 en/git-bisect.txt:442
+#, priority:100
msgid "Automatically bisect a broken test case:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:397
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ cat ~/test.sh\n"
"#!/bin/sh\n"
@@ -9862,28 +8526,25 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:403
-msgid ""
-"Here we use a `test.sh` custom script. In this script, if `make` fails, we "
-"skip the current commit. `check_test_case.sh` should `exit 0` if the test "
-"case passes, and `exit 1` otherwise."
+#, priority:100
+msgid "Here we use a `test.sh` custom script. In this script, if `make` fails, we skip the current commit. `check_test_case.sh` should `exit 0` if the test case passes, and `exit 1` otherwise."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:407
-msgid ""
-"It is safer if both `test.sh` and `check_test_case.sh` are outside the "
-"repository to prevent interactions between the bisect, make and test "
-"processes and the scripts."
+#, priority:100
+msgid "It is safer if both `test.sh` and `check_test_case.sh` are outside the repository to prevent interactions between the bisect, make and test processes and the scripts."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:409
+#, priority:100
msgid "Automatically bisect with temporary modifications (hot-fix):"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:413
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ cat ~/test.sh\n"
"#!/bin/sh\n"
@@ -9891,7 +8552,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:426
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"# tweak the working tree by merging the hot-fix branch\n"
"# and then attempt a build\n"
@@ -9909,7 +8570,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:429
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"# undo the tweak to allow clean flipping to the next commit\n"
"git reset --hard\n"
@@ -9917,7 +8578,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:432
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"# return control\n"
"exit $status\n"
@@ -9925,18 +8586,13 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:440
-msgid ""
-"This applies modifications from a hot-fix branch before each test run, "
-"e.g. in case your build or test environment changed so that older revisions "
-"may need a fix which newer ones have already. (Make sure the hot-fix branch "
-"is based off a commit which is contained in all revisions which you are "
-"bisecting, so that the merge does not pull in too much, or use `git "
-"cherry-pick` instead of `git merge`.)"
+#, priority:100
+msgid "This applies modifications from a hot-fix branch before each test run, e.g. in case your build or test environment changed so that older revisions may need a fix which newer ones have already. (Make sure the hot-fix branch is based off a commit which is contained in all revisions which you are bisecting, so that the merge does not pull in too much, or use `git cherry-pick` instead of `git merge`.)"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:447
-#, no-wrap
+#, no-wrap, priority:100
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"
@@ -9945,25 +8601,23 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:451
-msgid ""
-"This shows that you can do without a run script if you write the test on a "
-"single line."
+#, priority:100
+msgid "This shows that you can do without a run script if you write the test on a single line."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:453
+#, priority:100
msgid "Locate a good region of the object graph in a damaged repository"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:463
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] "
-"--no-checkout\n"
+"$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-checkout\n"
"$ git bisect run sh -c '\n"
-"\tGOOD=$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) "
-"&&\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"
@@ -9973,26 +8627,25 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:465
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bisect reset # quit the bisect session\n"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:470
-msgid ""
-"In this case, when 'git bisect run' finishes, bisect/bad will refer to a "
-"commit that has at least one parent whose reachable graph is fully "
-"traversable in the sense required by 'git pack objects'."
+#, priority:100
+msgid "In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that has at least one parent whose reachable graph is fully traversable in the sense required by 'git pack objects'."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:472
+#, priority:100
msgid "Look for a fix instead of a regression in the code"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:477
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git bisect start\n"
"$ git bisect new HEAD # current commit is marked as new\n"
@@ -10001,12 +8654,13 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:480
+#, priority:100
msgid "or:"
msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:484
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git bisect start --term-old broken --term-new fixed\n"
"$ git bisect fixed\n"
@@ -10015,97 +8669,78 @@ msgstr ""
#. type: Title ~
#: en/git-bisect.txt:487
-#, no-wrap
+#, no-wrap, priority:100
msgid "Getting help"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:491
-msgid ""
-"Use `git bisect` to get a short usage description, and `git bisect help` or "
-"`git bisect -h` to get a long usage description."
+#, priority:100
+msgid "Use `git bisect` to get a short usage description, and `git bisect help` or `git bisect -h` to get a long usage description."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:496
-msgid ""
-"link:git-bisect-lk2009.html[Fighting regressions with git bisect], "
-"linkgit:git-blame[1]."
+#, priority:100
+msgid "link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:git-blame[1]."
msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-blame(1)"
msgstr "git-blame(1)"
#. type: Plain text
#: en/git-blame.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-blame - Show what revision and author last modified each line of a file"
-msgstr ""
-"Mostrar qu챕 revisi처n y autor modificaron al 첬ltimo cada l챠nea de un archivo"
+msgstr "Mostrar qu챕 revisi처n y autor modificaron al 첬ltimo cada l챠nea de un archivo"
#. type: Plain text
#: en/git-blame.txt:16
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
-"'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] "
-"[--incremental]\n"
+"'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]\n"
"\t [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]\n"
"\t [--ignore-rev <rev>] [--ignore-revs-file <file>]\n"
-"\t [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse "
-"<rev>..<rev>]\n"
+"\t [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]\n"
"\t [--] <file>\n"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:22
-msgid ""
-"Annotates each line in the given file with information from the revision "
-"which last modified the line. Optionally, start annotating from the given "
-"revision."
+#, priority:100
+msgid "Annotates each line in the given file with information from the revision which last modified the line. Optionally, start annotating from the given revision."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:25
-msgid ""
-"When specified one or more times, `-L` restricts annotation to the requested "
-"lines."
+#, priority:100
+msgid "When specified one or more times, `-L` restricts annotation to the requested lines."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:31
-msgid ""
-"The origin of lines is automatically followed across whole-file renames "
-"(currently there is no option to turn the rename-following off). To follow "
-"lines moved from one file to another, or to follow lines that were copied "
-"and pasted from another file, etc., see the `-C` and `-M` options."
+#, priority:100
+msgid "The origin of lines is automatically followed across whole-file renames (currently there is no option to turn the rename-following off). To follow lines moved from one file to another, or to follow lines that were copied and pasted from another file, etc., see the `-C` and `-M` options."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:35
-msgid ""
-"The report does not tell you anything about lines which have been deleted or "
-"replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" "
-"interface briefly mentioned in the following paragraph."
+#, priority:100
+msgid "The report does not tell you anything about lines which have been deleted or replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" interface briefly mentioned in the following paragraph."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:42
-msgid ""
-"Apart from supporting file annotation, Git also supports searching the "
-"development history for when a code snippet occurred in a change. This makes "
-"it possible to track when a code snippet was added to a file, moved or "
-"copied between files, and eventually deleted or replaced. It works by "
-"searching for a text string in the diff. A small example of the pickaxe "
-"interface that searches for `blame_usage`:"
+#, priority:100
+msgid "Apart from supporting file annotation, Git also supports searching the development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for a text string in the diff. A small example of the pickaxe interface that searches for `blame_usage`:"
msgstr ""
#. type: delimited block -
#: en/git-blame.txt:47
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git log --pretty=oneline -S'blame_usage'\n"
"5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <ancestry-file>\n"
@@ -10114,177 +8749,157 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:55
-#, fuzzy
+#, fuzzy, priority:100
msgid "Use the same output mode as linkgit:git-annotate[1] (Default: off)."
msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
#. type: Labeled list
#: en/git-blame.txt:56
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--score-debug"
msgstr "--score-debug"
#. type: Plain text
#: en/git-blame.txt:64
-msgid ""
-"Include debugging information related to the movement of lines between files "
-"(see `-C`) and lines moved within a file (see `-M`). The first number "
-"listed is the score. This is the number of alphanumeric characters detected "
-"as having been moved between or within files. This must be above a certain "
-"threshold for 'git blame' to consider those lines of code to have been "
-"moved."
+#, priority:100
+msgid "Include debugging information related to the movement of lines between files (see `-C`) and lines moved within a file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected as having been moved between or within files. This must be above a certain threshold for 'git blame' to consider those lines of code to have been moved."
msgstr ""
#. type: Labeled list
#: en/git-blame.txt:66
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-name"
msgstr "--show-name"
#. type: Plain text
#: en/git-blame.txt:70
-msgid ""
-"Show the filename in the original commit. By default the filename is shown "
-"if there is any line that came from a file with a different name, due to "
-"rename detection."
+#, priority:100
+msgid "Show the filename in the original commit. By default the filename is shown if there is any line that came from a file with a different name, due to rename detection."
msgstr ""
#. type: Labeled list
#: en/git-blame.txt:72
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-number"
msgstr "--show-number"
#. type: Plain text
#: en/git-blame.txt:74
+#, priority:100
msgid "Show the line number in the original commit (Default: off)."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:77
+#, priority:100
msgid "Suppress the author name and timestamp from the output."
msgstr ""
#. type: Labeled list
#: en/git-blame.txt:79
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-email"
msgstr "--show-email"
#. type: Plain text
#: en/git-blame.txt:83
-msgid ""
-"Show the author email instead of author name (Default: off). This can also "
-"be controlled via the `blame.showEmail` config option."
+#, priority:100
+msgid "Show the author email instead of author name (Default: off). This can also be controlled via the `blame.showEmail` config option."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:87
-msgid ""
-"Ignore whitespace when comparing the parent's version and the child's to "
-"find where the lines came from."
+#, priority:100
+msgid "Ignore whitespace when comparing the parent's version and the child's to find where the lines came from."
msgstr ""
#. type: Labeled list
#: en/git-blame.txt:88 en/git-describe.txt:65
-#, no-wrap
+#, no-wrap, priority:260
msgid "--abbrev=<n>"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:92
-msgid ""
-"Instead of using the default 7+1 hexadecimal digits as the abbreviated "
-"object name, use <n>+1 digits. Note that 1 column is used for a caret to "
-"mark the boundary commit."
+#, priority:100
+msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use <n>+1 digits. Note that 1 column is used for a caret to mark the boundary commit."
msgstr ""
#. type: Title -
#: en/git-blame.txt:95
-#, no-wrap
+#, no-wrap, priority:100
msgid "THE PORCELAIN FORMAT"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:99
-msgid ""
-"In this format, each line is output after a header; the header at the "
-"minimum has the first line which has:"
+#, priority:100
+msgid "In this format, each line is output after a header; the header at the minimum has the first line which has:"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:101
+#, priority:100
msgid "40-byte SHA-1 of the commit the line is attributed to;"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:102
+#, priority:100
msgid "the line number of the line in the original file;"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:103
+#, priority:100
msgid "the line number of the line in the final file;"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:106
-msgid ""
-"on a line that starts a group of lines from a different commit than the "
-"previous one, the number of lines in this group. On subsequent lines this "
-"field is absent."
+#, priority:100
+msgid "on a line that starts a group of lines from a different commit than the previous one, the number of lines in this group. On subsequent lines this field is absent."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:109
-msgid ""
-"This header line is followed by the following information at least once for "
-"each commit:"
+#, priority:100
+msgid "This header line is followed by the following information at least once for each commit:"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:113
-msgid ""
-"the author name (\"author\"), email (\"author-mail\"), time "
-"(\"author-time\"), and time zone (\"author-tz\"); similarly for committer."
+#, priority:100
+msgid "the author name (\"author\"), email (\"author-mail\"), time (\"author-time\"), and time zone (\"author-tz\"); similarly for committer."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:114
+#, priority:100
msgid "the filename in the commit that the line is attributed to."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:115
+#, priority:100
msgid "the first line of the commit log message (\"summary\")."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:119
-msgid ""
-"The contents of the actual line is output after the above header, prefixed "
-"by a TAB. This is to allow adding more header elements later."
+#, priority:100
+msgid "The contents of the actual line is output after the above header, prefixed by a TAB. This is to allow adding more header elements later."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:127
-msgid ""
-"The porcelain format generally suppresses commit information that has "
-"already been seen. For example, two lines that are blamed to the same commit "
-"will both be shown, but the details for that commit will be shown only "
-"once. This is more efficient, but may require more state be kept by the "
-"reader. The `--line-porcelain` option can be used to output full commit "
-"information for each line, allowing simpler (but less efficient) usage "
-"like:"
+#, priority:100
+msgid "The porcelain format generally suppresses commit information that has already been seen. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once. This is more efficient, but may require more state be kept by the reader. The `--line-porcelain` option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like:"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:132
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t# count the number of lines attributed to each author\n"
"\tgit blame --line-porcelain file |\n"
@@ -10294,30 +8909,25 @@ msgstr ""
#. type: Title -
#: en/git-blame.txt:135 en/revisions.txt:247
-#, no-wrap
+#, no-wrap, priority:100
msgid "SPECIFYING RANGES"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:141
-msgid ""
-"Unlike 'git blame' and 'git annotate' in older versions of git, the extent "
-"of the annotation can be limited to both line ranges and revision "
-"ranges. The `-L` option, which limits annotation to a range of lines, may be "
-"specified multiple times."
+#, priority:100
+msgid "Unlike 'git blame' and 'git annotate' in older versions of git, the extent of the annotation can be limited to both line ranges and revision ranges. The `-L` option, which limits annotation to a range of lines, may be specified multiple times."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:146
-msgid ""
-"When you are interested in finding the origin for lines 40-60 for file "
-"`foo`, you can use the `-L` option like so (they mean the same thing -- both "
-"ask for 21 lines starting at line 40):"
+#, priority:100
+msgid "When you are interested in finding the origin for lines 40-60 for file `foo`, you can use the `-L` option like so (they mean the same thing -- both ask for 21 lines starting at line 40):"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:149
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tgit blame -L 40,60 foo\n"
"\tgit blame -L 40,+21 foo\n"
@@ -10325,31 +8935,31 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:151
+#, priority:100
msgid "Also you can use a regular expression to specify the line range:"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:153
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit blame -L '/^sub hello {/,/^}$/' foo\n"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:155
+#, priority:100
msgid "which limits the annotation to the body of the `hello` subroutine."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:159
-msgid ""
-"When you are not interested in changes older than version v2.6.18, or "
-"changes older than 3 weeks, you can use revision range specifiers similar to "
-"'git rev-list':"
+#, priority:100
+msgid "When you are not interested in changes older than version v2.6.18, or changes older than 3 weeks, you can use revision range specifiers similar to 'git rev-list':"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:162
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tgit blame v2.6.18.. -- foo\n"
"\tgit blame --since=3.weeks -- foo\n"
@@ -10357,140 +8967,121 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:168
-msgid ""
-"When revision range specifiers are used to limit the annotation, lines that "
-"have not changed since the range boundary (either the commit v2.6.18 or the "
-"most recent commit that is more than 3 weeks old in the above example) are "
-"blamed for that range boundary commit."
+#, priority:100
+msgid "When revision range specifiers are used to limit the annotation, lines that have not changed since the range boundary (either the commit v2.6.18 or the most recent commit that is more than 3 weeks old in the above example) are blamed for that range boundary commit."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:174
-msgid ""
-"A particularly useful way is to see if an added file has lines created by "
-"copy-and-paste from existing files. Sometimes this indicates that the "
-"developer was being sloppy and did not refactor the code properly. You can "
-"first find the commit that introduced the file with:"
+#, priority:100
+msgid "A particularly useful way is to see if an added file has lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that introduced the file with:"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:176
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit log --diff-filter=A --pretty=short -- foo\n"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:179
-msgid ""
-"and then annotate the change between the commit and its parents, using "
-"`commit^!` notation:"
+#, priority:100
+msgid "and then annotate the change between the commit and its parents, using `commit^!` notation:"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:181
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit blame -C -C -f $commit^! -- foo\n"
msgstr ""
#. type: Title -
#: en/git-blame.txt:184
-#, no-wrap
+#, no-wrap, priority:100
msgid "INCREMENTAL OUTPUT"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:191
-msgid ""
-"When called with `--incremental` option, the command outputs the result as "
-"it is built. The output generally will talk about lines touched by more "
-"recent commits first (i.e. the lines will be annotated out of order) and is "
-"meant to be used by interactive viewers."
+#, priority:100
+msgid "When called with `--incremental` option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by interactive viewers."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:195
-msgid ""
-"The output format is similar to the Porcelain format, but it does not "
-"contain the actual lines from the file that is being annotated."
+#, priority:100
+msgid "The output format is similar to the Porcelain format, but it does not contain the actual lines from the file that is being annotated."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:197
+#, priority:100
msgid "Each blame entry always starts with a line of:"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:199
-#, no-wrap
+#, no-wrap, priority:100
msgid "<40-byte hex sha1> <sourceline> <resultline> <num_lines>\n"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:201
+#, priority:100
msgid "Line numbers count from 1."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:206
-msgid ""
-"The first time that a commit shows up in the stream, it has various other "
-"information about it printed out with a one-word tag at the beginning of "
-"each line describing the extra commit information (author, email, committer, "
-"dates, summary, etc.)."
+#, priority:100
+msgid "The first time that a commit shows up in the stream, it has various other information about it printed out with a one-word tag at the beginning of each line describing the extra commit information (author, email, committer, dates, summary, etc.)."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:209
-msgid ""
-"Unlike the Porcelain format, the filename information is always given and "
-"terminates the entry:"
+#, priority:100
+msgid "Unlike the Porcelain format, the filename information is always given and terminates the entry:"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:211
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"filename\" <whitespace-quoted-filename-goes-here>\n"
msgstr ""
#. type: Plain text
#: en/git-blame.txt:214
-msgid ""
-"and thus it is really quite easy to parse for some line- and word-oriented "
-"parser (which should be quite natural for most scripting languages)."
+#, priority:100
+msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:222
-msgid ""
-"For people who do parsing: to make it more robust, just ignore any lines "
-"between the first and last one (\"<sha1>\" and \"filename\" lines) where "
-"you do not recognize the tag words (or care about that particular one) at "
-"the beginning of the \"extended information\" lines. That way, if there is "
-"ever added information (like the commit encoding or extended commit "
-"commentary), a blame viewer will not care."
+#, priority:100
+msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
msgstr ""
#. type: Title -
#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:83
-#, no-wrap
+#, no-wrap, priority:260
msgid "MAPPING AUTHORS"
msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
+#, priority:240
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<length> | --no-abbrev]]\n"
@@ -10511,617 +9102,511 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-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."
+#, priority:240
+msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted 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
-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."
+#, priority:240
+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
-msgid ""
-"Note that when providing a `<pattern>`, you must use `--list`; otherwise the "
-"command may be interpreted as branch creation."
+#, priority:240
+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
-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)."
+#, priority:240
+msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-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`."
+#, ignore-ellipsis, priority:240
+msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-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."
+#, priority:240
+msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-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`."
+#, priority:240
+msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-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."
+#, priority:240
+msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-msgid ""
-"The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, "
-"except instead of the branch being renamed it along with its config and "
-"reflog will be copied to a new name."
+#, priority:240
+msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed it along with its config and reflog will be copied to a new name."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-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."
+#, priority:240
+msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-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."
+#, priority:240
+msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-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`."
+#, priority:240
+msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
+#, priority:240
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-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`."
+#, priority:240
+msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-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`)."
+#, priority:240
+msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
+#, priority:240
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
+#, no-wrap, priority:240
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
+#, priority:240
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
+#, priority:240
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:547
-#, no-wrap
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
+#, no-wrap, priority:240
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
+#, priority:240
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-msgid ""
-"Color branches to highlight current, local, and remote-tracking branches. "
-"The value must be always (the default), never, or auto."
+#, priority:240
+msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-msgid ""
-"Turn off branch colors, even when the configuration file gives the default "
-"to color output. Same as `--color=never`."
+#, priority:240
+msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
-#, no-wrap
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, fuzzy
+#, fuzzy, priority:240
msgid "Sorting and filtering branches are case insensitive."
msgstr "ordenamiento y filtrado son case-insensitive"
#. type: Labeled list
#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
-#, no-wrap
+#, no-wrap, priority:280
msgid "--column[=<options>]"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-column"
msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-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."
+#, priority:240
+msgid "Display branch listing in columns. See configuration variable column.branch for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
+#, priority:240
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
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-msgid ""
-"List or delete (if used with -d) the remote-tracking branches. Combine with "
-"`--list` to match the optional pattern(s)."
+#, priority:240
+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
-msgid ""
-"List both remote-tracking branches and local branches. Combine with "
-"`--list` to match optional pattern(s)."
+#, priority:240
+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
-msgid ""
-"List branches. With optional `<pattern>...`, e.g. `git branch --list "
-"'maint-*'`, list only the branches that match the pattern(s)."
+#, ignore-ellipsis, priority:240
+msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-msgid ""
-"Print the name of the current branch. In detached HEAD state, nothing is "
-"printed."
+#, priority:240
+msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-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)."
+#, priority:240
+msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the 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
-msgid ""
-"Be more quiet when creating or deleting a branch, suppressing non-error "
-"messages."
+#, priority:240
+msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:197
-#, no-wrap
+#, no-wrap, priority:240
msgid "--abbrev=<length>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:201
-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."
+#, priority:240
+msgid "Alter the sha1's minimum display length in the output listing. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:204
+#, priority:240
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206 en/git-checkout.txt:158 en/git-switch.txt:152
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:214
-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."
+#, priority:240
+msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:220
-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."
+#, priority:240
+msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git 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:221 en/git-checkout.txt:172 en/git-switch.txt:167
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:224
-msgid ""
-"Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge "
-"configuration variable is true."
+#, priority:240
+msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:228
-msgid ""
-"As this option had confusing syntax, it is no longer supported. Please use "
-"`--track` or `--set-upstream-to` instead."
+#, priority:240
+msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:229
-#, no-wrap
+#, no-wrap, priority:240
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:230
-#, no-wrap
+#, no-wrap, priority:240
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:234
-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."
+#, priority:240
+msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:235
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:238
-msgid ""
-"Remove the upstream information for <branchname>. If no branch is specified "
-"it defaults to the current branch."
+#, priority:240
+msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:239
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:244
-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."
+#, priority:240
+msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:245 en/git-tag.txt:142
-#, no-wrap
+#, no-wrap, priority:240
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:248
-msgid ""
-"Only list branches which contain the specified commit (HEAD if not "
-"specified). Implies `--list`."
+#, priority:240
+msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:249 en/git-tag.txt:146
-#, no-wrap
+#, no-wrap, priority:240
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:252
-msgid ""
-"Only list branches which don't contain the specified commit (HEAD if not "
-"specified). Implies `--list`."
+#, priority:240
+msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:253 en/git-tag.txt:150
-#, no-wrap
+#, no-wrap, priority:240
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:257
-msgid ""
-"Only list branches whose tips are reachable from the specified commit (HEAD "
-"if not specified). Implies `--list`, incompatible with `--no-merged`."
+#, priority:240
+msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--no-merged`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:258 en/git-tag.txt:154
-#, no-wrap
+#, no-wrap, priority:240
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-msgid ""
-"Only list branches whose tips are not reachable from the specified commit "
-"(HEAD if not specified). Implies `--list`, incompatible with `--merged`."
+#, priority:240
+msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--merged`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:263
-#, no-wrap
+#, no-wrap, priority:240
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-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."
+#, priority:240
+msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:269 en/git-switch.txt:42
-#, no-wrap
+#, no-wrap, priority:240
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-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."
+#, priority:240
+msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:274
-#, no-wrap
+#, no-wrap, priority:240
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
+#, priority:240
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:240
msgid "<newbranch>"
msgstr "[nueva rama]"
#. type: Plain text
#: en/git-branch.txt:280
-msgid ""
-"The new name for an existing branch. The same restrictions as for "
-"<branchname> apply."
+#, priority:240
+msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
-#, no-wrap
+#: 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
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-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]."
+#, ignore-ellipsis, priority:240
+msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:293 en/git-tag.txt:158
-#, no-wrap
+#, no-wrap, priority:240
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
+#, priority:240
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap
+#, no-wrap, priority:240
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-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]."
+#, priority:240
+msgid "A string that interpolates `%(fieldname)` from a branch ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:306
-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]."
+#, priority:240
+msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:310
-#, no-wrap
+#, no-wrap, priority:240
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -11131,20 +9616,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-msgid ""
-"This step and the next one could be combined into a single step with "
-"\"checkout -b my2.6.14 v2.6.14\"."
+#, priority:240
+msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:322
-#, no-wrap
+#, no-wrap, priority:240
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -11154,29 +9638,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-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]."
+#, priority:240
+msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:336
-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."
+#, priority:240
+msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap
+#, no-wrap, priority:240
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -11184,100 +9664,87 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-msgid ""
-"Using `-a` would conflate <remote> with any local branches you happen to "
-"have been prefixed with the same <remote> pattern."
+#, priority:240
+msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-msgid ""
-"`for-each-ref` can take a wide range of options. See "
-"linkgit:git-for-each-ref[1]"
+#, priority:240
+msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
+#, priority:240
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#, no-wrap
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-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."
+#, priority:240
+msgid "If you are creating a branch that you want to switch to immediately, it is easier to use the \"git switch\" command with its `-c` option to do the same thing with a single command."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:359
-msgid ""
-"The options `--contains`, `--no-contains`, `--merged` and `--no-merged` "
-"serve four related but different purposes:"
+#, priority:240
+msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:363
-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>."
+#, priority:240
+msgid "`--contains <commit>` is used to find all branches which will need special attention if <commit> were to be rebased or amended, since those branches contain the specified <commit>."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:366
-msgid ""
-"`--no-contains <commit>` is the inverse of that, i.e. branches that don't "
-"contain the specified <commit>."
+#, priority:240
+msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:369
-msgid ""
-"`--merged` is used to find all branches which can be safely deleted, since "
-"those branches are fully contained by HEAD."
+#, priority:240
+msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:372
-msgid ""
-"`--no-merged` is used to find branches which are candidates for merging into "
-"HEAD, since those branches are not fully contained by HEAD."
+#, priority:240
+msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:380
-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."
+#, priority:240
+msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-bundle(1)"
msgstr "git-bundle(1)"
#. type: Plain text
#: en/git-bundle.txt:7
+#, priority:100
msgid "git-bundle - Move objects and refs by archive"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git bundle' create [-q | --quiet | --progress | --all-progress] "
-"[--all-progress-implied] <file> <git-rev-list-args>\n"
+"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args>\n"
"'git bundle' verify [-q | --quiet] <file>\n"
"'git bundle' list-heads <file> [<refname>...]\n"
"'git bundle' unbundle <file> [<refname>...]\n"
@@ -11285,222 +9752,163 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:24
-msgid ""
-"Some workflows require that one or more branches of development on one "
-"machine be replicated on another machine, but the two machines cannot be "
-"directly connected, and therefore the interactive Git protocols (git, ssh, "
-"http) cannot be used."
+#, priority:100
+msgid "Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected, and therefore the interactive Git protocols (git, ssh, http) cannot be used."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:29
-msgid ""
-"The 'git bundle' command packages objects and references in an archive at "
-"the originating machine, which can then be imported into another repository "
-"using 'git fetch', 'git pull', or 'git clone', after moving the archive by "
-"some means (e.g., by sneakernet)."
+#, priority:100
+msgid "The 'git bundle' command packages objects and references in an archive at the originating machine, which can then be imported into another repository using 'git fetch', 'git pull', or 'git clone', after moving the archive by some means (e.g., by sneakernet)."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:35
-msgid ""
-"As no direct connection between the repositories exists, the user must "
-"specify a basis for the bundle that is held by the destination repository: "
-"the bundle assumes that all objects in the basis are already in the "
-"destination repository."
+#, priority:100
+msgid "As no direct connection between the repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the destination repository."
msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:39
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "create [options] <file> <git-rev-list-args>"
msgstr "git bundle create [<opciones>] <file> <git-rev-list args>"
#. type: Plain text
#: en/git-bundle.txt:44
-msgid ""
-"Used to create a bundle named 'file'. This requires the "
-"'<git-rev-list-args>' arguments to define the bundle contents. 'options' "
-"contains the options specific to the 'git bundle create' subcommand."
+#, priority:100
+msgid "Used to create a bundle named 'file'. This requires the '<git-rev-list-args>' arguments to define the bundle contents. 'options' contains the options specific to the 'git bundle create' subcommand."
msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "verify <file>"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:52
-msgid ""
-"Used to check that a bundle file is valid and will apply cleanly to the "
-"current repository. This includes checks on the bundle format itself as "
-"well as checking that the prerequisite commits exist and are fully linked in "
-"the current repository. 'git bundle' prints a list of missing commits, if "
-"any, and exits with a non-zero status."
+#, priority:100
+msgid "Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. 'git bundle' prints a list of missing commits, if any, and exits with a non-zero status."
msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:53
-#, no-wrap
+#, no-wrap, priority:100
msgid "list-heads <file>"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:57
-msgid ""
-"Lists the references defined in the bundle. If followed by a list of "
-"references, only references matching those given are printed out."
+#, priority:100
+msgid "Lists the references defined in the bundle. If followed by a list of references, only references matching those given are printed out."
msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:58
-#, no-wrap
+#, no-wrap, priority:100
msgid "unbundle <file>"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:64
-msgid ""
-"Passes the objects in the bundle to 'git index-pack' for storage in the "
-"repository, then prints the names of all defined references. If a list of "
-"references is given, only references matching those in the list are "
-"printed. This command is really plumbing, intended to be called only by 'git "
-"fetch'."
+#, priority:100
+msgid "Passes the objects in the bundle to 'git index-pack' for storage in the repository, then prints the names of all defined references. If a list of references is given, only references matching those in the list are printed. This command is really plumbing, intended to be called only by 'git fetch'."
msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:65
-#, no-wrap
+#, no-wrap, priority:100
msgid "<git-rev-list-args>"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:74
-msgid ""
-"A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and "
-"containing a named ref, see SPECIFYING REFERENCES below), that specifies the "
-"specific objects and references to transport. For example, "
-"`master~10..master` causes the current master reference to be packaged along "
-"with all objects added since its 10th ancestor commit. There is no explicit "
-"limit to the number of references and objects that may be packaged."
+#, priority:100
+msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES below), that specifies the specific objects and references to transport. For example, `master~10..master` causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit limit to the number of references and objects that may be packaged."
msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:76
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<refname>...]"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:82
-msgid ""
-"A list of references used to limit the references reported as "
-"available. This is principally of use to 'git fetch', which expects to "
-"receive only those references asked for and not necessarily everything in "
-"the pack (in this case, 'git bundle' acts like 'git fetch-pack')."
+#, priority:100
+msgid "A list of references used to limit the references reported as available. This is principally of use to 'git fetch', which expects to receive only those references asked for and not necessarily everything in the pack (in this case, 'git bundle' acts like 'git fetch-pack')."
msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:89 en/git-pack-objects.txt:157
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--all-progress"
msgstr "--all-progress"
#. type: Plain text
#: en/git-bundle.txt:99 en/git-pack-objects.txt:167
-msgid ""
-"When --stdout is specified then progress report is displayed during the "
-"object count and compression phases but inhibited during the write-out "
-"phase. The reason is that in some cases the output stream is directly linked "
-"to another command which may wish to display progress status of its own as "
-"it processes incoming pack data. This flag is like --progress except that "
-"it forces progress report for the write-out phase as well even if --stdout "
-"is used."
+#, priority:100
+msgid "When --stdout is specified then progress report is displayed during the object count and compression phases but inhibited during the write-out phase. The reason is that in some cases the output stream is directly linked to another command which may wish to display progress status of its own as it processes incoming pack data. This flag is like --progress except that it forces progress report for the write-out phase as well even if --stdout is used."
msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:100 en/git-pack-objects.txt:168
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
#. type: Plain text
#: en/git-bundle.txt:104 en/git-pack-objects.txt:172
-msgid ""
-"This is used to imply --all-progress whenever progress display is "
-"activated. Unlike --all-progress this flag doesn't actually force any "
-"progress display by itself."
+#, priority:100
+msgid "This is used to imply --all-progress whenever progress display is activated. Unlike --all-progress this flag doesn't actually force any progress display by itself."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:109 en/git-pack-objects.txt:176
-msgid ""
-"This flag makes the command not to report its progress on the standard error "
-"stream."
+#, priority:100
+msgid "This flag makes the command not to report its progress on the standard error stream."
msgstr ""
#. type: Title -
#: en/git-bundle.txt:111
-#, no-wrap
+#, no-wrap, priority:100
msgid "SPECIFYING REFERENCES"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:121
-msgid ""
-"'git bundle' will only package references that are shown by 'git show-ref': "
-"this includes heads, tags, and remote heads. References such as `master~1` "
-"cannot be packaged, but are perfectly suitable for defining the basis. More "
-"than one reference may be packaged, and more than one basis can be "
-"specified. The objects packaged are those not contained in the union of the "
-"given bases. Each basis can be specified explicitly (e.g. `^master~10`), or "
-"implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
+#, priority:100
+msgid "'git bundle' will only package references that are shown by 'git show-ref': this includes heads, tags, and remote heads. References such as `master~1` cannot be packaged, but are perfectly suitable for defining the basis. More than one reference may be packaged, and more than one basis can be specified. The objects packaged are those not contained in the union of the given bases. Each basis can be specified explicitly (e.g. `^master~10`), or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:126
-msgid ""
-"It is very important that the basis used be held by the destination. It is "
-"okay to err on the side of caution, causing the bundle file to contain "
-"objects already in the destination, as these are ignored when unpacking at "
-"the destination."
+#, priority:100
+msgid "It is very important that the basis used be held by the destination. It is okay to err on the side of caution, causing the bundle file to contain objects already in the destination, as these are ignored when unpacking at the destination."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:134
-msgid ""
-"`git clone` can use any bundle created without negative refspecs (e.g., "
-"`new`, but not `old..new`). If you want to match `git clone --mirror`, "
-"which would include your refs such as `refs/remotes/*`, use `--all`. If you "
-"want to provide the same set of refs that a clone directly from the source "
-"repository would get, use `--branches --tags` for the `<git-rev-list-args>`."
+#, priority:100
+msgid "`git clone` can use any bundle created without negative refspecs (e.g., `new`, but not `old..new`). If you want to match `git clone --mirror`, which would include your refs such as `refs/remotes/*`, use `--all`. If you want to provide the same set of refs that a clone directly from the source repository would get, use `--branches --tags` for the `<git-rev-list-args>`."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:143
-msgid ""
-"Assume you want to transfer the history from a repository R1 on machine A to "
-"another repository R2 on machine B. For whatever reason, direct connection "
-"between A and B is not allowed, but we can move data from A to B via some "
-"mechanism (CD, email, etc.). We want to update R2 with development made on "
-"the branch master in R1."
+#, priority:100
+msgid "Assume you want to transfer the history from a repository R1 on machine A to another repository R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc.). We want to update R2 with development made on the branch master in R1."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:148
-msgid ""
-"To bootstrap the process, you can first create a bundle that does not have "
-"any basis. You can use a tag to remember up to what commit you last "
-"processed, in order to make it easy to later update the other repository "
-"with an incremental bundle:"
+#, priority:100
+msgid "To bootstrap the process, you can first create a bundle that does not have any basis. You can use a tag to remember up to what commit you last processed, in order to make it easy to later update the other repository with an incremental bundle:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:153
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"machineA$ cd R1\n"
"machineA$ git bundle create file.bundle master\n"
@@ -11509,29 +9917,25 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:158
-msgid ""
-"Then you transfer file.bundle to the target machine B. Because this bundle "
-"does not require any existing object to be extracted, you can create a new "
-"repository on machine B by cloning from it:"
+#, priority:100
+msgid "Then you transfer file.bundle to the target machine B. Because this bundle does not require any existing object to be extracted, you can create a new repository on machine B by cloning from it:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:161
-#, no-wrap
+#, no-wrap, priority:100
msgid "machineB$ git clone -b master /home/me/tmp/file.bundle R2\n"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:166
-msgid ""
-"This will define a remote called \"origin\" in the resulting repository that "
-"lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will "
-"have an entry like this:"
+#, priority:100
+msgid "This will define a remote called \"origin\" in the resulting repository that lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will have an entry like this:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:171
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[remote \"origin\"]\n"
" url = /home/me/tmp/file.bundle\n"
@@ -11540,22 +9944,19 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:176
-msgid ""
-"To update the resulting mine.git repository, you can fetch or pull after "
-"replacing the bundle stored at /home/me/tmp/file.bundle with incremental "
-"updates."
+#, priority:100
+msgid "To update the resulting mine.git repository, you can fetch or pull after replacing the bundle stored at /home/me/tmp/file.bundle with incremental updates."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:179
-msgid ""
-"After working some more in the original repository, you can create an "
-"incremental bundle to update the other repository:"
+#, priority:100
+msgid "After working some more in the original repository, you can create an incremental bundle to update the other repository:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:184
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"machineA$ cd R1\n"
"machineA$ git bundle create file.bundle lastR2bundle..master\n"
@@ -11564,14 +9965,13 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:188
-msgid ""
-"You then transfer the bundle to the other machine to replace "
-"/home/me/tmp/file.bundle, and pull from it."
+#, priority:100
+msgid "You then transfer the bundle to the other machine to replace /home/me/tmp/file.bundle, and pull from it."
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:192
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"machineB$ cd R2\n"
"machineB$ git pull\n"
@@ -11579,377 +9979,315 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:200
-msgid ""
-"If you know up to what commit the intended recipient repository should have "
-"the necessary objects, you can use that knowledge to specify the basis, "
-"giving a cut-off point to limit the revisions and objects that go in the "
-"resulting bundle. The previous example used the lastR2bundle tag for this "
-"purpose, but you can use any other options that you would give to the "
-"linkgit:git-log[1] command. Here are more examples:"
+#, priority:100
+msgid "If you know up to what commit the intended recipient repository should have the necessary objects, you can use that knowledge to specify the basis, giving a cut-off point to limit the revisions and objects that go in the resulting bundle. The previous example used the lastR2bundle tag for this purpose, but you can use any other options that you would give to the linkgit:git-log[1] command. Here are more examples:"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:202
+#, priority:100
msgid "You can use a tag that is present in both:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:205
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bundle create mybundle v1.0.0..master\n"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:208
+#, priority:100
msgid "You can use a basis based on time:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:211
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bundle create mybundle --since=10.days master\n"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:214
+#, priority:100
msgid "You can use the number of commits:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:217
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bundle create mybundle -10 master\n"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:221
-msgid ""
-"You can run `git-bundle verify` to see if you can extract from a bundle that "
-"was created with a basis:"
+#, priority:100
+msgid "You can run `git-bundle verify` to see if you can extract from a bundle that was created with a basis:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:224
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git bundle verify mybundle\n"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:228
-msgid ""
-"This will list what commits you must have in order to extract from the "
-"bundle and will error out if you do not have them."
+#, priority:100
+msgid "This will list what commits you must have in order to extract from the bundle and will error out if you do not have them."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:232
-msgid ""
-"A bundle from a recipient repository's point of view is just like a regular "
-"repository which it fetches or pulls from. You can, for example, map "
-"references when fetching:"
+#, priority:100
+msgid "A bundle from a recipient repository's point of view is just like a regular repository which it fetches or pulls from. You can, for example, map references when fetching:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:235
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git fetch mybundle master:localRef\n"
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:238
+#, priority:100
msgid "You can also see what references it offers:"
msgstr ""
#. type: delimited block -
#: en/git-bundle.txt:241
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git ls-remote mybundle\n"
msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-cat-file(1)"
msgstr "git-cat-file(1)"
#. type: Plain text
#: en/git-cat-file.txt:7
-#, fuzzy
-msgid ""
-"git-cat-file - Provide content or type and size information for repository "
-"objects"
-msgstr ""
-"Proveer contenido o tipo y tama챰o de informaci처n para objetos de repositorio"
+#, fuzzy, priority:100
+msgid "git-cat-file - Provide content or type and size information for repository objects"
+msgstr "Proveer contenido o tipo y tama챰o de informaci처n para objetos de repositorio"
#. type: Plain text
#: en/git-cat-file.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
-"'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | "
-"-p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] "
-"[--follow-symlinks]\n"
+"'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
+"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:21
-msgid ""
-"In its first form, the command provides the content or the type of an object "
-"in the repository. The type is required unless `-t` or `-p` is used to find "
-"the object type, or `-s` is used to find the object size, or `--textconv` or "
-"`--filters` is used (which imply type \"blob\")."
+#, priority:100
+msgid "In its first form, the command provides the content or the type of an object in the repository. The type is required unless `-t` or `-p` is used to find the object type, or `-s` is used to find the object size, or `--textconv` or `--filters` is used (which imply type \"blob\")."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:28
-msgid ""
-"In the second form, a list of objects (separated by linefeeds) is provided "
-"on stdin, and the SHA-1, type, and size of each object is printed on "
-"stdout. The output format can be overridden using the optional `<format>` "
-"argument. If either `--textconv` or `--filters` was specified, the input is "
-"expected to list the object names followed by the path name, separated by a "
-"single whitespace, so that the appropriate drivers can be determined."
+#, priority:100
+msgid "In the second form, a list of objects (separated by linefeeds) is provided on stdin, and the SHA-1, type, and size of each object is printed on stdout. The output format can be overridden using the optional `<format>` argument. If either `--textconv` or `--filters` was specified, the input is expected to list the object names followed by the path name, separated by a single whitespace, so that the appropriate drivers can be determined."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
-#, fuzzy, no-wrap
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
+#, fuzzy, no-wrap, priority:240
msgid "<object>"
msgstr "objeto"
#. type: Plain text
#: en/git-cat-file.txt:35
-msgid ""
-"The name of the object to show. For a more complete list of ways to spell "
-"object names, see the \"SPECIFYING REVISIONS\" section in "
-"linkgit:gitrevisions[7]."
+#, priority:100
+msgid "The name of the object to show. For a more complete list of ways to spell object names, see the \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:39
+#, priority:100
msgid "Instead of the content, show the object type identified by <object>."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:43
+#, priority:100
msgid "Instead of the content, show the object size identified by <object>."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:48
-msgid ""
-"Exit with zero status if <object> exists and is a valid object. If <object> "
-"is of an invalid format exit with non-zero and emits an error on stderr."
+#, priority:100
+msgid "Exit with zero status if <object> exists and is a valid object. If <object> is of an invalid format exit with non-zero and emits an error on stderr."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:51
+#, priority:100
msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
-#, no-wrap
+#: en/git-cat-file.txt:52 en/git.txt:363
+#, no-wrap, priority:100
msgid "<type>"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:59
-msgid ""
-"Typically this matches the real type of <object> but asking for a type that "
-"can trivially be dereferenced from the given <object> is also permitted. An "
-"example is to ask for a \"tree\" with <object> being a commit object that "
-"contains it, or to ask for a \"blob\" with <object> being a tag object that "
-"points at it."
+#, priority:100
+msgid "Typically this matches the real type of <object> but asking for a type that can trivially be dereferenced from the given <object> is also permitted. An example is to ask for a \"tree\" with <object> being a commit object that contains it, or to ask for a \"blob\" with <object> being a tag object that points at it."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:65
-msgid ""
-"Show the content as transformed by a textconv filter. In this case, <object> "
-"has to be of the form <tree-ish>:<path>, or :<path> in order to apply the "
-"filter to the content recorded in the index at <path>."
+#, priority:100
+msgid "Show the content as transformed by a textconv filter. In this case, <object> has to be of the form <tree-ish>:<path>, or :<path> in order to apply the filter to the content recorded in the index at <path>."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:66
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--filters"
msgstr "--filters"
#. type: Plain text
#: en/git-cat-file.txt:71
-msgid ""
-"Show the content as converted by the filters configured in the current "
-"working tree for the given <path> (i.e. smudge filters, end-of-line "
-"conversion, etc). In this case, <object> has to be of the form "
-"<tree-ish>:<path>, or :<path>."
+#, priority:100
+msgid "Show the content as converted by the filters configured in the current working tree for the given <path> (i.e. smudge filters, end-of-line conversion, etc). In this case, <object> has to be of the form <tree-ish>:<path>, or :<path>."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:72
-#, no-wrap
+#, no-wrap, priority:100
msgid "--path=<path>"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:76
-msgid ""
-"For use with --textconv or --filters, to allow specifying an object name and "
-"a path separately, e.g. when it is difficult to figure out the revision from "
-"which the blob came."
+#, priority:100
+msgid "For use with --textconv or --filters, to allow specifying an object name and a path separately, e.g. when it is difficult to figure out the revision from which the blob came."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:77 en/git-mktree.txt:32
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--batch"
msgstr "--batch"
#. type: Labeled list
#: en/git-cat-file.txt:78
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "--batch=<format>"
msgstr "--patch-format"
#. type: Plain text
#: en/git-cat-file.txt:84
-msgid ""
-"Print object information and contents for each object provided on stdin. "
-"May not be combined with any other options or arguments except `--textconv` "
-"or `--filters`, in which case the input lines also need to specify the path, "
-"separated by whitespace. See the section `BATCH OUTPUT` below for details."
+#, priority:100
+msgid "Print object information and contents for each object provided on stdin. May not be combined with any other options or arguments except `--textconv` or `--filters`, in which case the input lines also need to specify the path, separated by whitespace. See the section `BATCH OUTPUT` below for details."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:85
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--batch-check"
msgstr "--batch-check"
#. type: Labeled list
#: en/git-cat-file.txt:86
-#, no-wrap
+#, no-wrap, priority:100
msgid "--batch-check=<format>"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:92
-msgid ""
-"Print object information for each object provided on stdin. May not be "
-"combined with any other options or arguments except `--textconv` or "
-"`--filters`, in which case the input lines also need to specify the path, "
-"separated by whitespace. See the section `BATCH OUTPUT` below for details."
+#, priority:100
+msgid "Print object information for each object provided on stdin. May not be combined with any other options or arguments except `--textconv` or `--filters`, in which case the input lines also need to specify the path, separated by whitespace. See the section `BATCH OUTPUT` below for details."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:93
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--batch-all-objects"
msgstr "--batch-all-objects"
#. type: Plain text
#: en/git-cat-file.txt:99
-msgid ""
-"Instead of reading a list of objects on stdin, perform the requested batch "
-"operation on all objects in the repository and any alternate object stores "
-"(not just reachable objects). Requires `--batch` or `--batch-check` be "
-"specified. Note that the objects are visited in order sorted by their "
-"hashes."
+#, priority:100
+msgid "Instead of reading a list of objects on stdin, perform the requested batch operation on all objects in the repository and any alternate object stores (not just reachable objects). Requires `--batch` or `--batch-check` be specified. Note that the objects are visited in order sorted by their hashes."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:100
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--buffer"
msgstr "--buffer"
#. type: Plain text
#: en/git-cat-file.txt:106
-msgid ""
-"Normally batch output is flushed after each object is output, so that a "
-"process can interactively read and write from `cat-file`. With this option, "
-"the output uses normal stdio buffering; this is much more efficient when "
-"invoking `--batch-check` on a large number of objects."
+#, priority:100
+msgid "Normally batch output is flushed after each object is output, so that a process can interactively read and write from `cat-file`. With this option, the output uses normal stdio buffering; this is much more efficient when invoking `--batch-check` on a large number of objects."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:107
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unordered"
msgstr "--unordered"
#. type: Plain text
#: en/git-cat-file.txt:116
-msgid ""
-"When `--batch-all-objects` is in use, visit objects in an order which may be "
-"more efficient for accessing the object contents than hash order. The exact "
-"details of the order are unspecified, but if you do not require a specific "
-"order, this should generally result in faster output, especially with "
-"`--batch`. Note that `cat-file` will still show each object only once, even "
-"if it is stored multiple times in the repository."
+#, priority:100
+msgid "When `--batch-all-objects` is in use, visit objects in an order which may be more efficient for accessing the object contents than hash order. The exact details of the order are unspecified, but if you do not require a specific order, this should generally result in faster output, especially with `--batch`. Note that `cat-file` will still show each object only once, even if it is stored multiple times in the repository."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:117
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--allow-unknown-type"
msgstr "--allow-unknown-type"
#. type: Plain text
#: en/git-cat-file.txt:119
+#, priority:100
msgid "Allow -s or -t to query broken/corrupt objects of unknown type."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:120
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--follow-symlinks"
msgstr "--follow-symlinks"
#. type: Plain text
#: en/git-cat-file.txt:129
-msgid ""
-"With --batch or --batch-check, follow symlinks inside the repository when "
-"requesting objects with extended SHA-1 expressions of the form "
-"tree-ish:path-in-tree. Instead of providing output about the link itself, "
-"provide output about the linked-to object. If a symlink points outside the "
-"tree-ish (e.g. a link to /foo or a root-level link to ../foo), the portion "
-"of the link which is outside the tree will be printed."
+#, priority:100
+msgid "With --batch or --batch-check, follow symlinks inside the repository when requesting objects with extended SHA-1 expressions of the form tree-ish:path-in-tree. Instead of providing output about the link itself, provide output about the linked-to object. If a symlink points outside the tree-ish (e.g. a link to /foo or a root-level link to ../foo), the portion of the link which is outside the tree will be printed."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:133
-msgid ""
-"This option does not (currently) work correctly when an object in the index "
-"is specified (e.g. `:link` instead of `HEAD:link`) rather than one in the "
-"tree."
+#, priority:100
+msgid "This option does not (currently) work correctly when an object in the index is specified (e.g. `:link` instead of `HEAD:link`) rather than one in the tree."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:136
-msgid ""
-"This option cannot (currently) be used unless `--batch` or `--batch-check` "
-"is used."
+#, priority:100
+msgid "This option cannot (currently) be used unless `--batch` or `--batch-check` is used."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:138
+#, priority:100
msgid "For example, consider a git repository containing:"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:145
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tf: a file containing \"hello\\n\"\n"
"\tlink: a symlink to f\n"
@@ -11960,45 +10298,43 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:148
+#, priority:100
msgid "For a regular file `f`, `echo HEAD:f | git cat-file --batch` would print"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:151
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tce013625030ba8dba906f756967f9e9ca394464a blob 6\n"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:156
-msgid ""
-"And `echo HEAD:link | git cat-file --batch --follow-symlinks` would print "
-"the same thing, as would `HEAD:dir/link`, as they both point at `HEAD:f`."
+#, priority:100
+msgid "And `echo HEAD:link | git cat-file --batch --follow-symlinks` would print the same thing, as would `HEAD:dir/link`, as they both point at `HEAD:f`."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:159
-msgid ""
-"Without `--follow-symlinks`, these would print data about the symlink "
-"itself. In the case of `HEAD:link`, you would see"
+#, priority:100
+msgid "Without `--follow-symlinks`, these would print data about the symlink itself. In the case of `HEAD:link`, you would see"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:162
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t4d1ae35ba2c8ec712fa2a379db44ad639ca277bd blob 1\n"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:166
-msgid ""
-"Both `plink` and `alink` point outside the tree, so they would respectively "
-"print:"
+#, priority:100
+msgid "Both `plink` and `alink` point outside the tree, so they would respectively print:"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:170
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tsymlink 4\n"
"\t../f\n"
@@ -12006,172 +10342,159 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:173
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tsymlink 11\n"
"\t/etc/passwd\n"
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
-#, no-wrap
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:179
+#, priority:100
msgid "If `-t` is specified, one of the <type>."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:181
+#, priority:100
msgid "If `-s` is specified, the size of the <object> in bytes."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:183
+#, priority:100
msgid "If `-e` is specified, no output, unless the <object> is malformed."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:185
+#, priority:100
msgid "If `-p` is specified, the contents of <object> are pretty-printed."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:188
-msgid ""
-"If <type> is specified, the raw (though uncompressed) contents of the "
-"<object> will be returned."
+#, priority:100
+msgid "If <type> is specified, the raw (though uncompressed) contents of the <object> will be returned."
msgstr ""
#. type: Title -
#: en/git-cat-file.txt:190
-#, no-wrap
+#, no-wrap, priority:100
msgid "BATCH OUTPUT"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:196
-msgid ""
-"If `--batch` or `--batch-check` is given, `cat-file` will read objects from "
-"stdin, one per line, and print information about them. By default, the whole "
-"line is considered as an object, as if it were fed to "
-"linkgit:git-rev-parse[1]."
+#, priority:100
+msgid "If `--batch` or `--batch-check` is given, `cat-file` will read objects from stdin, one per line, and print information about them. By default, the whole line is considered as an object, as if it were fed to linkgit:git-rev-parse[1]."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:201
-msgid ""
-"You can specify the information shown for each object by using a custom "
-"`<format>`. The `<format>` is copied literally to stdout for each object, "
-"with placeholders of the form `%(atom)` expanded, followed by a newline. The "
-"available atoms are:"
+#, priority:100
+msgid "You can specify the information shown for each object by using a custom `<format>`. The `<format>` is copied literally to stdout for each object, with placeholders of the form `%(atom)` expanded, followed by a newline. The available atoms are:"
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:202
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`objectname`"
msgstr "`objectname`"
#. type: Plain text
#: en/git-cat-file.txt:204
+#, priority:100
msgid "The 40-hex object name of the object."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`objecttype`"
msgstr "`objecttype`"
#. type: Plain text
#: en/git-cat-file.txt:207
+#, priority:100
msgid "The type of the object (the same as `cat-file -t` reports)."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:208
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`objectsize`"
msgstr "`objectsize`"
#. type: Plain text
#: en/git-cat-file.txt:211
+#, priority:100
msgid "The size, in bytes, of the object (the same as `cat-file -s` reports)."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:212
-#, no-wrap
+#, no-wrap, priority:100
msgid "`objectsize:disk`"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:215
-msgid ""
-"The size, in bytes, that the object takes up on disk. See the note about "
-"on-disk sizes in the `CAVEATS` section below."
+#, priority:100
+msgid "The size, in bytes, that the object takes up on disk. See the note about on-disk sizes in the `CAVEATS` section below."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:216
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`deltabase`"
msgstr "`deltabase`"
#. type: Plain text
#: en/git-cat-file.txt:220
-msgid ""
-"If the object is stored as a delta on-disk, this expands to the 40-hex sha1 "
-"of the delta base object. Otherwise, expands to the null sha1 (40 "
-"zeroes). See `CAVEATS` below."
+#, priority:100
+msgid "If the object is stored as a delta on-disk, this expands to the 40-hex sha1 of the delta base object. Otherwise, expands to the null sha1 (40 zeroes). See `CAVEATS` below."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:221
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`rest`"
msgstr "`rest`"
#. type: Plain text
#: en/git-cat-file.txt:227
-msgid ""
-"If this atom is used in the output string, input lines are split at the "
-"first whitespace boundary. All characters before that whitespace are "
-"considered to be the object name; characters after that first run of "
-"whitespace (i.e., the \"rest\" of the line) are output in place of the "
-"`%(rest)` atom."
+#, priority:100
+msgid "If this atom is used in the output string, input lines are split at the first whitespace boundary. All characters before that whitespace are considered to be the object name; characters after that first run of whitespace (i.e., the \"rest\" of the line) are output in place of the `%(rest)` atom."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:230
-msgid ""
-"If no format is specified, the default format is `%(objectname) "
-"%(objecttype) %(objectsize)`."
+#, priority:100
+msgid "If no format is specified, the default format is `%(objectname) %(objecttype) %(objectsize)`."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:234
-msgid ""
-"If `--batch` is specified, the object information is followed by the object "
-"contents (consisting of `%(objectsize)` bytes), followed by a newline."
+#, priority:100
+msgid "If `--batch` is specified, the object information is followed by the object contents (consisting of `%(objectsize)` bytes), followed by a newline."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:236
+#, priority:100
msgid "For example, `--batch` without a custom format would produce:"
msgstr ""
#. type: delimited block -
#: en/git-cat-file.txt:240
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"<sha1> SP <type> SP <size> LF\n"
"<contents> LF\n"
@@ -12179,52 +10502,49 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:243
+#, priority:100
msgid "Whereas `--batch-check='%(objectname) %(objecttype)'` would produce:"
msgstr ""
#. type: delimited block -
#: en/git-cat-file.txt:246
-#, no-wrap
+#, no-wrap, priority:100
msgid "<sha1> SP <type> LF\n"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:250
-msgid ""
-"If a name is specified on stdin that cannot be resolved to an object in the "
-"repository, then `cat-file` will ignore any custom format and print:"
+#, priority:100
+msgid "If a name is specified on stdin that cannot be resolved to an object in the repository, then `cat-file` will ignore any custom format and print:"
msgstr ""
#. type: delimited block -
#: en/git-cat-file.txt:253 en/git-cat-file.txt:279
-#, no-wrap
+#, no-wrap, priority:100
msgid "<object> SP missing LF\n"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:256
-msgid ""
-"If a name is specified that might refer to more than one object (an "
-"ambiguous short sha), then `cat-file` will ignore any custom format and "
-"print:"
+#, priority:100
+msgid "If a name is specified that might refer to more than one object (an ambiguous short sha), then `cat-file` will ignore any custom format and print:"
msgstr ""
#. type: delimited block -
#: en/git-cat-file.txt:259
-#, no-wrap
+#, no-wrap, priority:100
msgid "<object> SP ambiguous LF\n"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:264
-msgid ""
-"If --follow-symlinks is used, and a symlink in the repository points outside "
-"the repository, then `cat-file` will ignore any custom format and print:"
+#, priority:100
+msgid "If --follow-symlinks is used, and a symlink in the repository points outside the repository, then `cat-file` will ignore any custom format and print:"
msgstr ""
#. type: delimited block -
#: en/git-cat-file.txt:268
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"symlink SP <size> LF\n"
"<symlink> LF\n"
@@ -12232,27 +10552,25 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:273
-msgid ""
-"The symlink will either be absolute (beginning with a /), or relative to the "
-"tree root. For instance, if dir/link points to ../../foo, then <symlink> "
-"will be ../foo. <size> is the size of the symlink in bytes."
+#, priority:100
+msgid "The symlink will either be absolute (beginning with a /), or relative to the tree root. For instance, if dir/link points to ../../foo, then <symlink> will be ../foo. <size> is the size of the symlink in bytes."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:276
-msgid ""
-"If --follow-symlinks is used, the following error messages will be "
-"displayed:"
+#, priority:100
+msgid "If --follow-symlinks is used, the following error messages will be displayed:"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:281
+#, priority:100
msgid "is printed when the initial symlink requested does not exist."
msgstr ""
#. type: delimited block -
#: en/git-cat-file.txt:285
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"dangling SP <size> LF\n"
"<object> LF\n"
@@ -12260,14 +10578,13 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:288
-msgid ""
-"is printed when the initial symlink exists, but something that it "
-"(transitive-of) points to does not."
+#, priority:100
+msgid "is printed when the initial symlink exists, but something that it (transitive-of) points to does not."
msgstr ""
#. type: delimited block -
#: en/git-cat-file.txt:292
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"loop SP <size> LF\n"
"<object> LF\n"
@@ -12275,14 +10592,13 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:295
-msgid ""
-"is printed for symlink loops (or any symlinks that require more than 40 link "
-"resolutions to resolve)."
+#, priority:100
+msgid "is printed for symlink loops (or any symlinks that require more than 40 link resolutions to resolve)."
msgstr ""
#. type: delimited block -
#: en/git-cat-file.txt:299
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"notdir SP <size> LF\n"
"<object> LF\n"
@@ -12290,51 +10606,43 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:302
-msgid ""
-"is printed when, during symlink resolution, a file is used as a directory "
-"name."
+#, priority:100
+msgid "is printed when, during symlink resolution, a file is used as a directory name."
msgstr ""
#. type: Title -
#: en/git-cat-file.txt:304 en/git-for-each-ref.txt:375 en/git-svn.txt:999
-#, no-wrap
+#, no-wrap, priority:100
msgid "CAVEATS"
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:312 en/git-for-each-ref.txt:383
-msgid ""
-"Note that the sizes of objects on disk are reported accurately, but care "
-"should be taken in drawing conclusions about which refs or objects are "
-"responsible for disk usage. The size of a packed non-delta object may be "
-"much larger than the size of objects which delta against it, but the choice "
-"of which object is the base and which is the delta is arbitrary and is "
-"subject to change during a repack."
+#, priority:100
+msgid "Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage. The size of a packed non-delta object may be much larger than the size of objects which delta against it, but the choice of which object is the base and which is the delta is arbitrary and is subject to change during a repack."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:387
-msgid ""
-"Note also that multiple copies of an object may be present in the object "
-"database; in this case, it is undefined which copy's size or delta base will "
-"be reported."
+#, priority:100
+msgid "Note also that multiple copies of an object may be present in the object database; in this case, it is undefined which copy's size or delta base will be reported."
msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-check-attr(1)"
msgstr "git-check-attr(1)"
#. type: Plain text
#: en/git-check-attr.txt:7
+#, priority:100
msgid "git-check-attr - Display gitattributes information"
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git check-attr' [-a | --all | <attr>...] [--] <pathname>...\n"
"'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
@@ -12342,148 +10650,139 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:19
-msgid ""
-"For every pathname, this command will list if each attribute is "
-"'unspecified', 'set', or 'unset' as a gitattribute on that pathname."
+#, priority:100
+msgid "For every pathname, this command will list if each attribute is 'unspecified', 'set', or 'unset' as a gitattribute on that pathname."
msgstr ""
#. type: Labeled list
#: en/git-check-attr.txt:22
-#, no-wrap
+#, no-wrap, priority:100
msgid "-a, --all"
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:26
-msgid ""
-"List all attributes that are associated with the specified paths. If this "
-"option is used, then 'unspecified' attributes will not be included in the "
-"output."
+#, priority:100
+msgid "List all attributes that are associated with the specified paths. If this option is used, then 'unspecified' attributes will not be included in the output."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:29
+#, priority:100
msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
-#, no-wrap
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
-msgid ""
-"Read pathnames from the standard input, one per line, instead of from the "
-"command-line."
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
+#, priority:100
+msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:38
-msgid ""
-"The output format is modified to be machine-parsable. If `--stdin` is also "
-"given, input paths are separated with a NUL character instead of a linefeed "
-"character."
+#, priority:100
+msgid "The output format is modified to be machine-parsable. If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:42
-msgid ""
-"Interpret all preceding arguments as attributes and all following arguments "
-"as path names."
+#, priority:100
+msgid "Interpret all preceding arguments as attributes and all following arguments as path names."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:46
-msgid ""
-"If none of `--stdin`, `--all`, or `--` is used, the first argument will be "
-"treated as an attribute and the rest of the arguments as pathnames."
+#, priority:100
+msgid "If none of `--stdin`, `--all`, or `--` is used, the first argument will be treated as an attribute and the rest of the arguments as pathnames."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:52
+#, priority:100
msgid "The output is of the form: <path> COLON SP <attribute> COLON SP <info> LF"
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:55
-msgid ""
-"unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL "
-"<attribute> NUL <info> NUL"
+#, priority:100
+msgid "unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL <attribute> NUL <info> NUL"
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:59
-msgid ""
-"<path> is the path of a file being queried, <attribute> is an attribute "
-"being queried and <info> can be either:"
+#, priority:100
+msgid "<path> is the path of a file being queried, <attribute> is an attribute being queried and <info> can be either:"
msgstr ""
#. type: Labeled list
#: en/git-check-attr.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'unspecified'"
msgstr "'unspecified'"
#. type: Plain text
#: en/git-check-attr.txt:61
+#, priority:100
msgid "when the attribute is not defined for the path."
msgstr ""
#. type: Labeled list
#: en/git-check-attr.txt:61
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'unset'"
msgstr "'unset'"
#. type: Plain text
#: en/git-check-attr.txt:62
+#, priority:100
msgid "when the attribute is defined as false."
msgstr ""
#. type: Labeled list
#: en/git-check-attr.txt:62
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'set'"
msgstr "'set'"
#. type: Plain text
#: en/git-check-attr.txt:63
+#, priority:100
msgid "when the attribute is defined as true."
msgstr ""
#. type: Labeled list
#: en/git-check-attr.txt:63
-#, no-wrap
+#, no-wrap, priority:100
msgid "<value>"
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:64
+#, priority:100
msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
-msgid ""
-"Buffering happens as documented under the `GIT_FLUSH` option in "
-"linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by "
-"overfilling an input buffer or reading from an empty output buffer."
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
+#, priority:100
+msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:74
+#, priority:100
msgid "In the examples, the following '.gitattributes' file is used:"
msgstr ""
#. type: delimited block -
#: en/git-check-attr.txt:78
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"*.java diff=java -crlf myAttr\n"
"NoMyAttr.java !myAttr\n"
@@ -12492,12 +10791,13 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:81
+#, priority:100
msgid "Listing a single attribute:"
msgstr ""
#. type: delimited block -
#: en/git-check-attr.txt:84
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git check-attr diff org/example/MyClass.java\n"
"org/example/MyClass.java: diff: java\n"
@@ -12505,12 +10805,13 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:87
+#, priority:100
msgid "Listing multiple attributes for a file:"
msgstr ""
#. type: delimited block -
#: en/git-check-attr.txt:92
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git check-attr crlf diff myAttr -- org/example/MyClass.java\n"
"org/example/MyClass.java: crlf: unset\n"
@@ -12520,12 +10821,13 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:95
+#, priority:100
msgid "Listing all attributes for a file:"
msgstr ""
#. type: delimited block -
#: en/git-check-attr.txt:99
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git check-attr --all -- org/example/MyClass.java\n"
"org/example/MyClass.java: diff: java\n"
@@ -12534,27 +10836,28 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:102
+#, priority:100
msgid "Listing an attribute for multiple files:"
msgstr ""
#. type: delimited block -
#: en/git-check-attr.txt:106
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
-"$ git check-attr myAttr -- org/example/MyClass.java "
-"org/example/NoMyAttr.java\n"
+"$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java\n"
"org/example/MyClass.java: myAttr: set\n"
"org/example/NoMyAttr.java: myAttr: unspecified\n"
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:109
+#, priority:100
msgid "Not all values are equally unambiguous:"
msgstr ""
#. type: delimited block -
#: en/git-check-attr.txt:112
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git check-attr caveat README\n"
"README: caveat: unspecified\n"
@@ -12568,19 +10871,19 @@ msgstr "linkgit:gitattributes[5]."
#. type: Title =
#: en/git-check-ignore.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-check-ignore(1)"
msgstr "git-check-ignore(1)"
#. type: Plain text
#: en/git-check-ignore.txt:7
+#, priority:100
msgid "git-check-ignore - Debug gitignore / exclude files"
msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git check-ignore' [<options>] <pathname>...\n"
"'git check-ignore' [<options>] --stdin\n"
@@ -12588,243 +10891,217 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:22
-msgid ""
-"For each pathname given via the command-line or from a file via `--stdin`, "
-"check whether the file is excluded by .gitignore (or other input files to "
-"the exclude mechanism) and output the path if it is excluded."
+#, priority:100
+msgid "For each pathname given via the command-line or from a file via `--stdin`, check whether the file is excluded by .gitignore (or other input files to the exclude mechanism) and output the path if it is excluded."
msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:25
-msgid ""
-"By default, tracked files are not shown at all since they are not subject to "
-"exclude rules; but see `--no-index'."
+#, priority:100
+msgid "By default, tracked files are not shown at all since they are not subject to exclude rules; but see `--no-index'."
msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:28
-#, no-wrap
+#, no-wrap, priority:100
msgid "-q, --quiet"
msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:31
-msgid ""
-"Don't output anything, just set exit status. This is only valid with a "
-"single pathname."
+#, priority:100
+msgid "Don't output anything, just set exit status. This is only valid with a single pathname."
msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:32
-#, no-wrap
+#, no-wrap, priority:100
msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
-msgid ""
-"Also output details about the matching pattern (if any) for each given "
-"pathname. For precedence rules within and between exclude sources, see "
-"linkgit:gitignore[5]."
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
-msgid ""
-"The output format is modified to be machine-parsable (see below). If "
-"`--stdin` is also given, input paths are separated with a NUL character "
-"instead of a linefeed character."
+#: en/git-check-ignore.txt:42
+#, priority:100
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:51
+#, priority:100
+msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
-#, no-wrap
+#: en/git-check-ignore.txt:52
+#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
-msgid ""
-"Show given paths which don't match any pattern.\t This only makes sense when "
-"`--verbose` is enabled, otherwise it would not be possible to distinguish "
-"between paths which match a pattern and those which don't."
+#: en/git-check-ignore.txt:57
+#, priority:100
+msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
-#, no-wrap
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
-msgid ""
-"Don't look in the index when undertaking the checks. This can be used to "
-"debug why a path became tracked by e.g. `git add .` and was not ignored by "
-"the rules as expected by the user or when developing patterns including "
-"negation to match a path previously added with `git add -f`."
+#: en/git-check-ignore.txt:64
+#, priority:100
+msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
-msgid ""
-"By default, any of the given pathnames which match an ignore pattern will be "
-"output, one per line. If no pattern matches a given path, nothing will be "
-"output for that path; this means that path will not be ignored."
+#: en/git-check-ignore.txt:72
+#, priority:100
+msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
+#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
+#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
-msgid ""
-"<pathname> is the path of a file being queried, <pattern> is the matching "
-"pattern, <source> is the pattern's source file, and <linenum> is the line "
-"number of the pattern within that source. If the pattern contained a `!` "
-"prefix or `/` suffix, it will be preserved in the output. <source> will be "
-"an absolute path when referring to the file configured by "
-"`core.excludesFile`, or relative to the repository root when referring to "
-"`.git/info/exclude` or a per-directory exclude file."
+#: en/git-check-ignore.txt:84
+#, priority:100
+msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
-msgid ""
-"If `-z` is specified, the pathnames in the output are delimited by the null "
-"character; if `--verbose` is also specified then null characters are also "
-"used instead of colons and hard tabs:"
+#: en/git-check-ignore.txt:88
+#, priority:100
+msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
+#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
-msgid ""
-"If `-n` or `--non-matching` are specified, non-matching pathnames will also "
-"be output, in which case all fields in each output record except for "
-"<pathname> will be empty. This can be useful when running "
-"non-interactively, so that files can be incrementally streamed to STDIN of a "
-"long-running check-ignore process, and for each of these files, STDOUT will "
-"indicate whether that file matched a pattern or not. (Without this option, "
-"it would be impossible to tell whether the absence of output for a given "
-"file meant that it didn't match any pattern, or that the output hadn't been "
-"generated yet.)"
+#: en/git-check-ignore.txt:100
+#, priority:100
+msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
-#, no-wrap
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
+#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
-#, no-wrap
+#: en/git-check-ignore.txt:109
+#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
+#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
-#, no-wrap
+#: en/git-check-ignore.txt:112
+#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
+#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
-#, no-wrap
+#: en/git-check-ignore.txt:115
+#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
+#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-check-mailmap(1)"
msgstr "git-check-mailmap(1)"
#. type: Plain text
#: en/git-check-mailmap.txt:7
+#, priority:100
msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git check-mailmap' [<options>] <contact>...\n"
msgstr "git check-mailmap [<opciones>] <contacto>..."
#. type: Plain text
#: en/git-check-mailmap.txt:22
-msgid ""
-"For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the "
-"command-line or standard input (when using `--stdin`), look up the person's "
-"canonical name and email address (see \"Mapping Authors\" below). If found, "
-"print them; otherwise print the input as-is."
+#, priority:100
+msgid "For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the command-line or standard input (when using `--stdin`), look up the person's canonical name and email address (see \"Mapping Authors\" below). If found, print them; otherwise print the input as-is."
msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:29
-msgid ""
-"Read contacts, one per line, from the standard input after exhausting "
-"contacts provided on the command-line."
+#, priority:100
+msgid "Read contacts, one per line, from the standard input after exhausting contacts provided on the command-line."
msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:37
-msgid ""
-"For each contact, a single line is output, terminated by a newline. If the "
-"name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is "
-"printed; otherwise only ``$$<user@host>$$'' is printed."
+#, priority:100
+msgid "For each contact, a single line is output, terminated by a newline. If the name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is printed; otherwise only ``$$<user@host>$$'' is printed."
msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-checkout-index(1)"
msgstr "git-checkout-index(1)"
#. type: Plain text
#: en/git-checkout-index.txt:7
+#, priority:100
msgid "git-checkout-index - Copy files from the index to the working tree"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:17
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]\n"
"\t\t [--stage=<number>|all]\n"
@@ -12835,394 +11112,338 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:22
-msgid ""
-"Will copy all files listed from the index to the working directory (not "
-"overwriting existing files)."
+#, priority:100
+msgid "Will copy all files listed from the index to the working directory (not overwriting existing files)."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:29
+#, priority:100
msgid "update stat information for the checked out entries in the index file."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:33
+#, priority:100
msgid "be quiet if files exist or are not in the index"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:37
-#, fuzzy
+#, fuzzy, priority:100
msgid "forces overwrite of existing files"
msgstr "forzar sobreescritura de los archivos existentes"
#. type: Plain text
#: en/git-checkout-index.txt:42
-msgid ""
-"checks out all files in the index. Cannot be used together with explicit "
-"filenames."
+#, priority:100
+msgid "checks out all files in the index. Cannot be used together with explicit filenames."
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-create"
msgstr "--no-create"
#. type: Plain text
#: en/git-checkout-index.txt:47
+#, priority:100
msgid "Don't checkout new files, only refresh files already checked out."
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:48
-#, no-wrap
+#, no-wrap, priority:100
msgid "--prefix=<string>"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:51
-msgid ""
-"When creating files, prepend <string> (usually a directory including a "
-"trailing /)"
+#, priority:100
+msgid "When creating files, prepend <string> (usually a directory including a trailing /)"
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:52
-#, no-wrap
+#, no-wrap, priority:100
msgid "--stage=<number>|all"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:56
-msgid ""
-"Instead of checking out unmerged entries, copy out the files from named "
-"stage. <number> must be between 1 and 3. Note: --stage=all automatically "
-"implies --temp."
+#, priority:100
+msgid "Instead of checking out unmerged entries, copy out the files from named stage. <number> must be between 1 and 3. Note: --stage=all automatically implies --temp."
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--temp"
msgstr "--temp"
#. type: Plain text
#: en/git-checkout-index.txt:61
-msgid ""
-"Instead of copying the files to the working directory write the content to "
-"temporary files. The temporary name associations will be written to stdout."
+#, priority:100
+msgid "Instead of copying the files to the working directory write the content to temporary files. The temporary name associations will be written to stdout."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:66 en/git-update-index.txt:158
-msgid ""
-"Instead of taking list of paths from the command line, read list of paths "
-"from the standard input. Paths are separated by LF (i.e. one path per line) "
-"by default."
+#, priority:100
+msgid "Instead of taking list of paths from the command line, read list of paths from the standard input. Paths are separated by LF (i.e. one path per line) by default."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:70
-msgid ""
-"Only meaningful with `--stdin`; paths are separated with NUL character "
-"instead of LF."
+#, priority:100
+msgid "Only meaningful with `--stdin`; paths are separated with NUL character instead of LF."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:73 en/git-checkout.txt:356 en/git-commit.txt:361 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:121 en/git-restore.txt:132 en/git-update-index.txt:229 en/git-verify-pack.txt:38
+#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:75
+#, priority:100
msgid "The order of the flags used to matter, but not anymore."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:79
-msgid ""
-"Just doing `git checkout-index` does nothing. You probably meant `git "
-"checkout-index -a`. And if you want to force it, you want `git "
-"checkout-index -f -a`."
+#, priority:100
+msgid "Just doing `git checkout-index` does nothing. You probably meant `git checkout-index -a`. And if you want to force it, you want `git checkout-index -f -a`."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:83
-msgid ""
-"Intuitiveness is not the goal here. Repeatability is. The reason for the "
-"\"no arguments means no work\" behavior is that from scripts you are "
-"supposed to be able to do:"
+#, priority:100
+msgid "Intuitiveness is not the goal here. Repeatability is. The reason for the \"no arguments means no work\" behavior is that from scripts you are supposed to be able to do:"
msgstr ""
#. type: delimited block -
#: en/git-checkout-index.txt:86
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ find . -name '*.h' -print0 | xargs -0 git checkout-index -f --\n"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:92
-msgid ""
-"which will force all existing `*.h` files to be replaced with their cached "
-"copies. If an empty command line implied \"all\", then this would "
-"force-refresh everything in the index, which was not the point. But since "
-"'git checkout-index' accepts --stdin it would be faster to use:"
+#, priority:100
+msgid "which will force all existing `*.h` files to be replaced with their cached copies. If an empty command line implied \"all\", then this would force-refresh everything in the index, which was not the point. But since 'git checkout-index' accepts --stdin it would be faster to use:"
msgstr ""
#. type: delimited block -
#: en/git-checkout-index.txt:95
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ find . -name '*.h' -print0 | git checkout-index -f -z --stdin\n"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:100
-msgid ""
-"The `--` is just a good idea when you know the rest will be filenames; it "
-"will prevent problems with a filename of, for example, `-a`. Using `--` is "
-"probably a good policy in scripts."
+#, priority:100
+msgid "The `--` is just a good idea when you know the rest will be filenames; it will prevent problems with a filename of, for example, `-a`. Using `--` is probably a good policy in scripts."
msgstr ""
#. type: Title -
#: en/git-checkout-index.txt:103
-#, no-wrap
+#, no-wrap, priority:100
msgid "Using --temp or --stage=all"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:110
-msgid ""
-"When `--temp` is used (or implied by `--stage=all`) 'git checkout-index' "
-"will create a temporary file for each index entry being checked out. The "
-"index will not be updated with stat information. These options can be "
-"useful if the caller needs all stages of all unmerged entries so that the "
-"unmerged files can be processed by an external merge tool."
+#, priority:100
+msgid "When `--temp` is used (or implied by `--stage=all`) 'git checkout-index' will create a temporary file for each index entry being checked out. The index will not be updated with stat information. These options can be useful if the caller needs all stages of all unmerged entries so that the unmerged files can be processed by an external merge tool."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:114
-msgid ""
-"A listing will be written to stdout providing the association of temporary "
-"file names to tracked path names. The listing format has two variations:"
+#, priority:100
+msgid "A listing will be written to stdout providing the association of temporary file names to tracked path names. The listing format has two variations:"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:116
+#, priority:100
msgid "tempname TAB path RS"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:121
-msgid ""
-"The first format is what gets used when `--stage` is omitted or is not "
-"`--stage=all`. The field tempname is the temporary file name holding the "
-"file content and path is the tracked path name in the index. Only the "
-"requested entries are output."
+#, priority:100
+msgid "The first format is what gets used when `--stage` is omitted or is not `--stage=all`. The field tempname is the temporary file name holding the file content and path is the tracked path name in the index. Only the requested entries are output."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:123
+#, priority:100
msgid "stage1temp SP stage2temp SP stage3tmp TAB path RS"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:129
-msgid ""
-"The second format is what gets used when `--stage=all`. The three stage "
-"temporary fields (stage1temp, stage2temp, stage3temp) list the name of the "
-"temporary file if there is a stage entry in the index or `.` if there is no "
-"stage entry. Paths which only have a stage 0 entry will always be omitted "
-"from the output."
+#, priority:100
+msgid "The second format is what gets used when `--stage=all`. The three stage temporary fields (stage1temp, stage2temp, stage3temp) list the name of the temporary file if there is a stage entry in the index or `.` if there is no stage entry. Paths which only have a stage 0 entry will always be omitted from the output."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:136
-msgid ""
-"In both formats RS (the record separator) is newline by default but will be "
-"the null byte if -z was passed on the command line. The temporary file "
-"names are always safe strings; they will never contain directory separators "
-"or whitespace characters. The path field is always relative to the current "
-"directory and the temporary file names are always relative to the top level "
-"directory."
+#, priority:100
+msgid "In both formats RS (the record separator) is newline by default but will be the null byte if -z was passed on the command line. The temporary file names are always safe strings; they will never contain directory separators or whitespace characters. The path field is always relative to the current directory and the temporary file names are always relative to the top level directory."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:140
-msgid ""
-"If the object being copied out to a temporary file is a symbolic link the "
-"content of the link will be written to a normal file. It is up to the "
-"end-user or the Porcelain to make use of this information."
+#, priority:100
+msgid "If the object being copied out to a temporary file is a symbolic link the content of the link will be written to a normal file. It is up to the end-user or the Porcelain to make use of this information."
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:144
-#, no-wrap
+#, no-wrap, priority:100
msgid "To update and refresh only the files already checked out"
msgstr ""
#. type: delimited block -
#: en/git-checkout-index.txt:148 en/git-update-index.txt:362
-#, no-wrap
-msgid ""
-"$ git checkout-index -n -f -a && git update-index --ignore-missing "
-"--refresh\n"
+#, no-wrap, priority:100
+msgid "$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh\n"
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:150
-#, no-wrap
+#, no-wrap, priority:100
msgid "Using 'git checkout-index' to \"export an entire tree\""
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:154
-msgid ""
-"The prefix ability basically makes it trivial to use 'git checkout-index' as "
-"an \"export as tree\" function. Just read the desired tree into the index, "
-"and do:"
+#, priority:100
+msgid "The prefix ability basically makes it trivial to use 'git checkout-index' as an \"export as tree\" function. Just read the desired tree into the index, and do:"
msgstr ""
#. type: delimited block -
#: en/git-checkout-index.txt:157
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git checkout-index --prefix=git-export-dir/ -a\n"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:161
+#, priority:100
msgid "`git checkout-index` will \"export\" the index into the specified directory."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:165
-msgid ""
-"The final \"/\" is important. The exported name is literally just prefixed "
-"with the specified string. Contrast this with the following example."
+#, priority:100
+msgid "The final \"/\" is important. The exported name is literally just prefixed with the specified string. Contrast this with the following example."
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:166
-#, no-wrap
+#, no-wrap, priority:100
msgid "Export files with a prefix"
msgstr ""
#. type: delimited block -
#: en/git-checkout-index.txt:170
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git checkout-index --prefix=.merged- Makefile\n"
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:174
-msgid ""
-"This will check out the currently cached copy of `Makefile` into the file "
-"`.merged-Makefile`."
+#, priority:100
+msgid "This will check out the currently cached copy of `Makefile` into the file `.merged-Makefile`."
msgstr ""
#. type: Title =
#: en/git-checkout.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
#. type: Plain text
#: en/git-checkout.txt:7
-#, fuzzy
+#, fuzzy, priority:240
msgid "git-checkout - Switch branches or restore working tree files"
msgstr "Cambia ramas o restaura los archivos de tu 찼rbol de trabajo"
#. type: Plain text
#: en/git-checkout.txt:18
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git checkout' [-q] [-f] [-m] [<branch>]\n"
"'git checkout' [-q] [-f] [-m] --detach [<branch>]\n"
"'git checkout' [-q] [-f] [-m] [--detach] <commit>\n"
-"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] "
-"[<start_point>]\n"
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] "
-"<pathspec>...\n"
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] "
-"--pathspec-from-file=<file> [--pathspec-file-nul]\n"
+"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
"'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:25
-msgid ""
-"Updates files in the working tree to match the version in the index or the "
-"specified tree. If no pathspec was given, 'git checkout' will also update "
-"`HEAD` to set the specified branch as the current branch."
+#, priority:240
+msgid "Updates files in the working tree to match the version in the index or the specified tree. If no pathspec was given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:26
-#, no-wrap
+#, no-wrap, priority:240
msgid "'git checkout' [<branch>]"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:32
-msgid ""
-"To prepare for working on `<branch>`, switch to it by updating the index and "
-"the files in the working tree, and by pointing `HEAD` at the branch. Local "
-"modifications to the files in the working tree are kept, so that they can be "
-"committed to the `<branch>`."
+#, priority:240
+msgid "To prepare for working on `<branch>`, switch to it by updating the index and the files in the working tree, and by pointing `HEAD` at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the `<branch>`."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:36
-msgid ""
-"If `<branch>` is not found but there does exist a tracking branch in exactly "
-"one remote (call it `<remote>`) with a matching name and `--no-guess` is not "
-"specified, treat as equivalent to"
+#, priority:240
+msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name and `--no-guess` is not specified, treat as equivalent to"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:39 en/git-checkout.txt:184
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git checkout -b <branch> --track <remote>/<branch>\n"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:45
-msgid ""
-"You could omit `<branch>`, in which case the command degenerates to \"check "
-"out the current branch\", which is a glorified no-op with rather expensive "
-"side-effects to show only the tracking information, if exists, for the "
-"current branch."
+#, priority:240
+msgid "You could omit `<branch>`, in which case the command degenerates to \"check out the current branch\", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:46
-#, no-wrap
+#, no-wrap, priority:240
msgid "'git checkout' -b|-B <new_branch> [<start point>]"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:54
-msgid ""
-"Specifying `-b` causes a new branch to be created as if "
-"linkgit:git-branch[1] were called and then checked out. In this case you "
-"can use the `--track` or `--no-track` options, which will be passed to 'git "
-"branch'. As a convenience, `--track` without `-b` implies branch creation; "
-"see the description of `--track` below."
+#, priority:240
+msgid "Specifying `-b` causes a new branch to be created as if linkgit:git-branch[1] were called and then checked out. In this case you can use the `--track` or `--no-track` options, which will be passed to 'git branch'. As a convenience, `--track` without `-b` implies branch creation; see the description of `--track` below."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:57
-msgid ""
-"If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, "
-"it is reset. This is the transactional equivalent of"
+#, priority:240
+msgid "If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:61
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git branch -f <branch> [<start point>]\n"
"$ git checkout <branch>\n"
@@ -13230,601 +11451,475 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:65
-msgid ""
-"that is to say, the branch is not reset/created unless \"git checkout\" is "
-"successful."
+#, priority:240
+msgid "that is to say, the branch is not reset/created unless \"git checkout\" is successful."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:66
-#, no-wrap
+#, no-wrap, priority:240
msgid "'git checkout' --detach [<branch>]"
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:67
-#, no-wrap
+#, no-wrap, priority:240
msgid "'git checkout' [--detach] <commit>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:75
-msgid ""
-"Prepare to work on top of `<commit>`, by detaching `HEAD` at it (see "
-"\"DETACHED HEAD\" section), and updating the index and the files in the "
-"working tree. Local modifications to the files in the working tree are "
-"kept, so that the resulting working tree will be the state recorded in the "
-"commit plus the local modifications."
+#, priority:240
+msgid "Prepare to work on top of `<commit>`, by detaching `HEAD` at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:79
-msgid ""
-"When the `<commit>` argument is a branch name, the `--detach` option can be "
-"used to detach `HEAD` at the tip of the branch (`git checkout <branch>` "
-"would check out that branch without detaching `HEAD`)."
+#, priority:240
+msgid "When the `<commit>` argument is a branch name, the `--detach` option can be used to detach `HEAD` at the tip of the branch (`git checkout <branch>` would check out that branch without detaching `HEAD`)."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:81
+#, priority:240
msgid "Omitting `<branch>` detaches `HEAD` at the tip of the current branch."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:82
-#, no-wrap
-msgid ""
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] "
-"<pathspec>..."
+#, ignore-ellipsis, no-wrap, priority:240
+msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>..."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:83
-#, no-wrap
-msgid ""
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] "
-"--pathspec-from-file=<file> [--pathspec-file-nul]"
+#, no-wrap, priority:240
+msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:90
-msgid ""
-"Overwrite the contents of the files that match the pathspec. When the "
-"`<tree-ish>` (most often a commit) is not given, overwrite working tree with "
-"the contents in the index. When the `<tree-ish>` is given, overwrite both "
-"the index and the working tree with the contents at the `<tree-ish>`."
+#, priority:240
+msgid "Overwrite the contents of the files that match the pathspec. When the `<tree-ish>` (most often a commit) is not given, overwrite working tree with the contents in the index. When the `<tree-ish>` is given, overwrite both the index and the working tree with the contents at the `<tree-ish>`."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:98
-msgid ""
-"The index may contain unmerged entries because of a previous failed merge. "
-"By default, if you try to check out such an entry from the index, the "
-"checkout operation will fail and nothing will be checked out. Using `-f` "
-"will ignore these unmerged entries. The contents from a specific side of "
-"the merge can be checked out of the index by using `--ours` or `--theirs`. "
-"With `-m`, changes made to the working tree file can be discarded to "
-"re-create the original conflicted merge result."
+#, priority:240
+msgid "The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. Using `-f` will ignore these unmerged entries. The contents from a specific side of the merge can be checked out of the index by using `--ours` or `--theirs`. With `-m`, changes made to the working tree file can be discarded to re-create the original conflicted merge result."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:99
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<찼rbol-ismo>] [--] [<pathspec>...]"
#. type: Plain text
#: en/git-checkout.txt:104
-msgid ""
-"This is similar to the previous mode, but lets you use the interactive "
-"interface to show the \"diff\" output and choose which hunks to use in the "
-"result. See below for the description of `--patch` option."
+#, priority:240
+msgid "This is similar to the previous mode, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result. See below for the description of `--patch` option."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
-#, fuzzy
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
+#, fuzzy, priority:240
msgid "Quiet, suppress feedback messages."
msgstr "suprimir mensajes de feedback"
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:70 en/git-switch.txt:145 en/merge-options.txt:152
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:75 en/git-switch.txt:150
-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`."
+#, priority:240
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:123
-msgid ""
-"When switching branches, proceed even if the index or the working tree "
-"differs from `HEAD`. This is used to throw away local changes."
+#, priority:240
+msgid "When switching branches, proceed even if the index or the working tree differs from `HEAD`. This is used to throw away local changes."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:126
-msgid ""
-"When checking out paths from the index, do not fail upon unmerged entries; "
-"instead, unmerged entries are ignored."
+#, priority:240
+msgid "When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are ignored."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:76
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:77
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--theirs"
msgstr "--theirs"
#. type: Plain text
#: en/git-checkout.txt:131
-msgid ""
-"When checking out paths from the index, check out stage #2 ('ours') or #3 "
-"('theirs') for unmerged paths."
+#, priority:240
+msgid "When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:136
-msgid ""
-"Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' "
-"may appear swapped; `--ours` gives the version from the branch the changes "
-"are rebased onto, while `--theirs` gives the version from the branch that "
-"holds your work that is being rebased."
+#, priority:240
+msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped; `--ours` gives the version from the branch the changes are rebased onto, while `--theirs` gives the version from the branch that holds your work that is being rebased."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:146
-msgid ""
-"This is because `rebase` is used in a workflow that treats the history at "
-"the remote as the shared canonical one, and treats the work done on the "
-"branch you are rebasing as the third-party work to be integrated, and you "
-"are temporarily assuming the role of the keeper of the canonical history "
-"during the rebase. As the keeper of the canonical history, you need to view "
-"the history from the remote as `ours` (i.e. \"our shared canonical "
-"history\"), while what you did on your side branch as `theirs` (i.e. \"one "
-"contributor's work on top of it\")."
+#, priority:240
+msgid "This is because `rebase` is used in a workflow that treats the history at the remote as the shared canonical one, and treats the work done on the branch you are rebasing as the third-party work to be integrated, and you are temporarily assuming the role of the keeper of the canonical history during the rebase. As the keeper of the canonical history, you need to view the history from the remote as `ours` (i.e. \"our shared canonical history\"), while what you did on your side branch as `theirs` (i.e. \"one contributor's work on top of it\")."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:147
-#, no-wrap
+#, no-wrap, priority:240
msgid "-b <new_branch>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:150
-msgid ""
-"Create a new branch named `<new_branch>` and start it at `<start_point>`; "
-"see linkgit:git-branch[1] for details."
+#, priority:240
+msgid "Create a new branch named `<new_branch>` and start it at `<start_point>`; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:151
-#, no-wrap
+#, no-wrap, priority:240
msgid "-B <new_branch>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:156
-msgid ""
-"Creates the branch `<new_branch>` and start it at `<start_point>`; if it "
-"already exists, then reset it to `<start_point>`. This is equivalent to "
-"running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
+#, priority:240
+msgid "Creates the branch `<new_branch>` and start it at `<start_point>`; if it already exists, then reset it to `<start_point>`. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:161
-msgid ""
-"When creating a new branch, set up \"upstream\" configuration. See "
-"\"--track\" in linkgit:git-branch[1] for details."
+#, priority:240
+msgid "When creating a new branch, set up \"upstream\" configuration. See \"--track\" in linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:171
-msgid ""
-"If no `-b` option is given, the name of the new branch will be derived from "
-"the remote-tracking branch, by looking at the local part of the refspec "
-"configured for the corresponding remote, and then stripping the initial part "
-"up to the \"*\". This would tell us to use `hack` as the local branch when "
-"branching off of `origin/hack` (or `remotes/origin/hack`, or even "
-"`refs/remotes/origin/hack`). If the given name has no slash, or the above "
-"guessing results in an empty name, the guessing is aborted. You can "
-"explicitly give a name with `-b` in such a case."
+#, priority:240
+msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:175 en/git-switch.txt:170
-msgid ""
-"Do not set up \"upstream\" configuration, even if the "
-"`branch.autoSetupMerge` configuration variable is true."
+#, priority:240
+msgid "Do not set up \"upstream\" configuration, even if the `branch.autoSetupMerge` configuration variable is true."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:176 en/git-switch.txt:87
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--guess"
msgstr "--guess"
#. type: Labeled list
#: en/git-checkout.txt:177 en/git-switch.txt:88
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-guess"
msgstr "--no-guess"
#. type: Plain text
#: en/git-checkout.txt:181 en/git-switch.txt:92
-msgid ""
-"If `<branch>` is not found but there does exist a tracking branch in exactly "
-"one remote (call it `<remote>`) with a matching name, treat as equivalent to"
+#, priority:240
+msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:194 en/git-switch.txt:104 en/git-worktree.txt:71
-msgid ""
-"If the branch exists in multiple remotes and one of them is named by the "
-"`checkout.defaultRemote` configuration variable, we'll use that one for the "
-"purposes of disambiguation, even if the `<branch>` isn't unique across all "
-"remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout "
-"remote branches from there if `<branch>` is ambiguous but exists on the "
-"'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
+#, priority:240
+msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the 'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:196
+#, priority:240
msgid "Use `--no-guess` to disable this."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:200
+#, priority:240
msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--detach"
msgstr "--detach"
#. type: Plain text
#: en/git-checkout.txt:207
-msgid ""
-"Rather than checking out a branch to work on it, check out a commit for "
-"inspection and discardable experiments. This is the default behavior of "
-"`git checkout <commit>` when `<commit>` is not a branch name. See the "
-"\"DETACHED HEAD\" section below for details."
+#, priority:240
+msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of `git checkout <commit>` when `<commit>` is not a branch name. See the \"DETACHED HEAD\" section below for details."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:208
-#, no-wrap
+#, no-wrap, priority:240
msgid "--orphan <new_branch>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:214
-msgid ""
-"Create a new 'orphan' branch, named `<new_branch>`, started from "
-"`<start_point>` and switch to it. The first commit made on this new branch "
-"will have no parents and it will be the root of a new history totally "
-"disconnected from all the other branches and commits."
+#, priority:240
+msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:219
-msgid ""
-"The index and the working tree are adjusted as if you had previously run "
-"`git checkout <start_point>`. This allows you to start a new history that "
-"records a set of paths similar to `<start_point>` by easily running `git "
-"commit -a` to make the root commit."
+#, priority:240
+msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`. This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:225
-msgid ""
-"This can be useful when you want to publish the tree from a commit without "
-"exposing its full history. You might want to do this to publish an open "
-"source branch of a project whose current tree is \"clean\", but whose full "
-"history contains proprietary or otherwise encumbered bits of code."
+#, priority:240
+msgid "This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is \"clean\", but whose full history contains proprietary or otherwise encumbered bits of code."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:232
-msgid ""
-"If you want to start a disconnected history that records a set of paths that "
-"is totally different from the one of `<start_point>`, then you should clear "
-"the index and the working tree right after creating the orphan branch by "
-"running `git rm -rf .` from the top level of the working tree. Afterwards "
-"you will be ready to prepare your new files, repopulating the working tree, "
-"by copying them from elsewhere, extracting a tarball, etc."
+#, priority:240
+msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:233 en/git-restore.txt:103
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
#: en/git-checkout.txt:238
-msgid ""
-"In sparse checkout mode, `git checkout -- <paths>` would update only entries "
-"matched by `<paths>` and sparse patterns in "
-"`$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and "
-"adds back any files in `<paths>`."
+#, priority:240
+msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by `<paths>` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in `<paths>`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
-#, no-wrap
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
#. type: Plain text
#: en/git-checkout.txt:249
-msgid ""
-"When switching branches, if you have local modifications to one or more "
-"files that are different between the current branch and the branch to which "
-"you are switching, the command refuses to switch branches in order to "
-"preserve your modifications in context. However, with this option, a "
-"three-way merge between the current branch, your working tree contents, and "
-"the new branch is done, and you will be on the new branch."
+#, priority:240
+msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:254 en/git-switch.txt:132
-msgid ""
-"When a merge conflict happens, the index entries for conflicting paths are "
-"left unmerged, and you need to resolve the conflicts and mark the resolved "
-"paths with `git add` (or `git rm` if the merge should result in deletion of "
-"the path)."
+#, priority:240
+msgid "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:257
-msgid ""
-"When checking out paths from the index, this option lets you recreate the "
-"conflicted merge in the specified paths."
+#, priority:240
+msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:259
+#, priority:240
msgid "When switching branches with `--merge`, staged changes may be lost."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:260 en/git-restore.txt:90 en/git-switch.txt:133
-#, no-wrap
+#, no-wrap, priority:240
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:266 en/git-restore.txt:96 en/git-switch.txt:139
-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)."
+#, priority:240
+msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:273
-msgid ""
-"Interactively select hunks in the difference between the `<tree-ish>` (or "
-"the index, if unspecified) and the working tree. The chosen hunks are then "
-"applied in reverse to the working tree (and if a `<tree-ish>` was specified, "
-"the index)."
+#, priority:240
+msgid "Interactively select hunks in the difference between the `<tree-ish>` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `<tree-ish>` was specified, the index)."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:277
-msgid ""
-"This means that you can use `git checkout -p` to selectively discard edits "
-"from your current working tree. See the ``Interactive Mode'' section of "
-"linkgit:git-add[1] to learn how to operate the `--patch` mode."
+#, priority:240
+msgid "This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:280
-msgid ""
-"Note that this option uses the no overlay mode by default (see also "
-"`--overlay`), and currently doesn't support overlay mode."
+#, priority:240
+msgid "Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:281 en/git-switch.txt:175
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
#. type: Plain text
#: en/git-checkout.txt:286
-msgid ""
-"`git checkout` refuses when the wanted ref is already checked out by another "
-"worktree. This option makes it check the ref out anyway. In other words, the "
-"ref can be held by more than one worktree."
+#, priority:240
+msgid "`git checkout` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:287 en/git-merge.txt:90
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--overwrite-ignore"
msgstr "--overwrite-ignore"
#. type: Labeled list
#: en/git-checkout.txt:288 en/git-merge.txt:91
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-overwrite-ignore"
msgstr "--no-overwrite-ignore"
#. type: Plain text
#: en/git-checkout.txt:292
-msgid ""
-"Silently overwrite ignored files when switching branches. This is the "
-"default behavior. Use `--no-overwrite-ignore` to abort the operation when "
-"the new branch contains ignored files."
+#, priority:240
+msgid "Silently overwrite ignored files when switching branches. This is the default behavior. Use `--no-overwrite-ignore` to abort the operation when the new branch contains ignored files."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:293 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-switch.txt:181
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
#. type: Plain text
#: en/git-checkout.txt:302
-msgid ""
-"Using `--recurse-submodules` will update the content of all initialized "
-"submodules according to the commit recorded in the superproject. If local "
-"modifications in a submodule would be overwritten the checkout will fail "
-"unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, the "
-"work trees of submodules will not be updated. Just like "
-"linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
+#, priority:240
+msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:303 en/git-restore.txt:110
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:304 en/git-restore.txt:111
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-overlay"
msgstr "--no-overlay"
#. type: Plain text
#: en/git-checkout.txt:310
-msgid ""
-"In the default overlay mode, `git checkout` never removes files from the "
-"index or the working tree. When specifying `--no-overlay`, files that "
-"appear in the index and working tree, but not in `<tree-ish>` are removed, "
-"to make them match `<tree-ish>` exactly."
+#, priority:240
+msgid "In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and working tree, but not in `<tree-ish>` are removed, to make them match `<tree-ish>` exactly."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:324 en/git-rebase.txt:243 en/git-switch.txt:36
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:240
msgid "<branch>"
msgstr "'branch'"
#. type: Plain text
#: en/git-checkout.txt:330
-msgid ""
-"Branch to checkout; if it refers to a branch (i.e., a name that, when "
-"prepended with \"refs/heads/\", is a valid ref), then that branch is checked "
-"out. Otherwise, if it refers to a valid commit, your `HEAD` becomes "
-"\"detached\" and you are no longer on any branch (see below for details)."
+#, priority:240
+msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:334
-msgid ""
-"You can use the `@{-N}` syntax to refer to the N-th last branch/commit "
-"checked out using \"git checkout\" operation. You may also specify `-` which "
-"is synonymous to `@{-1}`."
+#, priority:240
+msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:338 en/git-switch.txt:58
-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`."
+#, ignore-ellipsis, priority:240
+msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:339
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:240
msgid "<new_branch>"
msgstr "nueva-rama"
#. type: Plain text
#: en/git-checkout.txt:341 en/git-switch.txt:41
+#, priority:240
msgid "Name for the new branch."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:342
-#, no-wrap
+#, no-wrap, priority:240
msgid "<start_point>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:345
-msgid ""
-"The name of a commit at which to start the new branch; see "
-"linkgit:git-branch[1] for details. Defaults to `HEAD`."
+#, priority:240
+msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:349
-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`."
+#, ignore-ellipsis, priority:240
+msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353
-msgid ""
-"Tree to checkout from (when paths are given). If not specified, the index "
-"will be used."
+#, priority:240
+msgid "Tree to checkout from (when paths are given). If not specified, the index will be used."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:359 en/git-reset.txt:124 en/git-restore.txt:135
+#, priority:280
msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
+#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Title -
#: en/git-checkout.txt:363
-#, no-wrap
+#, no-wrap, priority:240
msgid "DETACHED HEAD"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:367
-msgid ""
-"`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each "
-"branch refers to a specific commit. Let's look at a repo with three commits, "
-"one of them tagged, and with branch `master` checked out:"
+#, priority:240
+msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:376
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
" |\n"
@@ -13837,23 +11932,19 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:383
-msgid ""
-"When a commit is created in this state, the branch is updated to refer to "
-"the new commit. Specifically, 'git commit' creates a new commit `d`, whose "
-"parent is commit `c`, and then updates branch `master` to refer to new "
-"commit `d`. `HEAD` still refers to branch `master` and so indirectly now "
-"refers to commit `d`:"
+#, priority:240
+msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:386 en/git-checkout.txt:421 en/git-checkout.txt:438
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ edit; git add; git commit\n"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:394
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
" |\n"
@@ -13866,16 +11957,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:400
-msgid ""
-"It is sometimes useful to be able to checkout a commit that is not at the "
-"tip of any named branch, or even to create a new commit that is not "
-"referenced by a named branch. Let's look at what happens when we checkout "
-"commit `b` (here we show two ways this may be done):"
+#, priority:240
+msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit `b` (here we show two ways this may be done):"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:404
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git checkout v2.0 # or\n"
"$ git checkout master^^\n"
@@ -13883,7 +11971,7 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:412
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'b')\n"
" |\n"
@@ -13896,16 +11984,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:418
-msgid ""
-"Notice that regardless of which checkout command we use, `HEAD` now refers "
-"directly to commit `b`. This is known as being in detached `HEAD` state. It "
-"means simply that `HEAD` refers to a specific commit, as opposed to "
-"referring to a named branch. Let's see what happens when we create a commit:"
+#, priority:240
+msgid "Notice that regardless of which checkout command we use, `HEAD` now refers directly to commit `b`. This is known as being in detached `HEAD` state. It means simply that `HEAD` refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:431
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'e')\n"
" |\n"
@@ -13920,14 +12005,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:435
-msgid ""
-"There is now a new commit `e`, but it is referenced only by `HEAD`. We can "
-"of course add yet another commit in this state:"
+#, priority:240
+msgid "There is now a new commit `e`, but it is referenced only by `HEAD`. We can of course add yet another commit in this state:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:448
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"\t HEAD (refers to commit 'f')\n"
"\t |\n"
@@ -13942,20 +12026,19 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:452
-msgid ""
-"In fact, we can perform all the normal Git operations. But, let's look at "
-"what happens when we then checkout `master`:"
+#, priority:240
+msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout `master`:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:455
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git checkout master\n"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:463
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
" e---f |\n"
@@ -13968,17 +12051,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:470
-msgid ""
-"It is important to realize that at this point nothing refers to commit "
-"`f`. Eventually commit `f` (and by extension commit `e`) will be deleted by "
-"the routine Git garbage collection process, unless we create a reference "
-"before that happens. If we have not yet moved away from commit `f`, any of "
-"these will create a reference to it:"
+#, priority:240
+msgid "It is important to realize that at this point nothing refers to commit `f`. Eventually commit `f` (and by extension commit `e`) will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit `f`, any of these will create a reference to it:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:475
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git checkout -b foo <1>\n"
"$ git branch foo <2>\n"
@@ -13987,38 +12066,31 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:480
-msgid ""
-"creates a new branch `foo`, which refers to commit `f`, and then updates "
-"`HEAD` to refer to branch `foo`. In other words, we'll no longer be in "
-"detached `HEAD` state after this command."
+#, priority:240
+msgid "creates a new branch `foo`, which refers to commit `f`, and then updates `HEAD` to refer to branch `foo`. In other words, we'll no longer be in detached `HEAD` state after this command."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:483
-msgid ""
-"similarly creates a new branch `foo`, which refers to commit `f`, but leaves "
-"`HEAD` detached."
+#, priority:240
+msgid "similarly creates a new branch `foo`, which refers to commit `f`, but leaves `HEAD` detached."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:486
-msgid ""
-"creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` "
-"detached."
+#, priority:240
+msgid "creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` detached."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:491
-msgid ""
-"If we have moved away from commit `f`, then we must first recover its object "
-"name (typically by using git reflog), and then we can create a reference to "
-"it. For example, to see the last two commits to which `HEAD` referred, we "
-"can use either of these commands:"
+#, priority:240
+msgid "If we have moved away from commit `f`, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which `HEAD` referred, we can use either of these commands:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:495
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git reflog -2 HEAD # or\n"
"$ git log -g -2 HEAD\n"
@@ -14026,33 +12098,25 @@ msgstr ""
#. type: Title -
#: en/git-checkout.txt:498
-#, no-wrap
+#, no-wrap, priority:240
msgid "ARGUMENT DISAMBIGUATION"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:508
-msgid ""
-"When there is only one argument given and it is not `--` (e.g. `git checkout "
-"abc`), and when the argument is both a valid `<tree-ish>` (e.g. a branch "
-"`abc` exists) and a valid `<pathspec>` (e.g. a file or a directory whose "
-"name is \"abc\" exists), Git would usually ask you to disambiguate. Because "
-"checking out a branch is so common an operation, however, `git checkout abc` "
-"takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- "
-"<pathspec>` if you want to checkout these paths out of the index."
+#, priority:240
+msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `<tree-ish>` (e.g. a branch `abc` exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:515
-msgid ""
-"The following sequence checks out the `master` branch, reverts the "
-"`Makefile` to two revisions back, deletes `hello.c` by mistake, and gets it "
-"back from the index."
+#, priority:240
+msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes `hello.c` by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:521
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git checkout master <1>\n"
"$ git checkout master~2 Makefile <2>\n"
@@ -14062,78 +12126,73 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:524
-#, fuzzy
+#, fuzzy, priority:240
msgid "switch branch"
msgstr "Cambiar branches"
#. type: Plain text
#: en/git-checkout.txt:525 en/git-restore.txt:153
+#, priority:240
msgid "take a file out of another commit"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:526
+#, priority:240
msgid "restore `hello.c` from the index"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:529
+#, priority:240
msgid "If you want to check out _all_ C source files out of the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:532
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:538
-msgid ""
-"Note the quotes around `*.c`. The file `hello.c` will also be checked out, "
-"even though it is no longer in the working tree, because the file globbing "
-"is used to match entries in the index (not in the working tree by the "
-"shell)."
+#, priority:240
+msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:542
-msgid ""
-"If you have an unfortunate branch that is named `hello.c`, this step would "
-"be confused as an instruction to switch to that branch. You should instead "
-"write:"
+#, priority:240
+msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:545
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:549 en/git-switch.txt:201
-msgid ""
-"After working in the wrong branch, switching to the correct branch would be "
-"done using:"
+#, priority:240
+msgid "After working in the wrong branch, switching to the correct branch would be done using:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:552
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git checkout mytopic\n"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:557
-msgid ""
-"However, your \"wrong\" branch and correct `mytopic` branch may differ in "
-"files that you have modified locally, in which case the above checkout would "
-"fail like this:"
+#, priority:240
+msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:561
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git checkout mytopic\n"
"error: You have local changes to 'frotz'; not switching branches.\n"
@@ -14141,14 +12200,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:565 en/git-switch.txt:217
-msgid ""
-"You can give the `-m` flag to the command, which would try a three-way "
-"merge:"
+#, priority:240
+msgid "You can give the `-m` flag to the command, which would try a three-way merge:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:569
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
"Auto-merging frotz\n"
@@ -14156,22 +12214,19 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:574 en/git-switch.txt:226
-msgid ""
-"After this three-way merge, the local modifications are _not_ registered in "
-"your index file, so `git diff` would show you what changes you made since "
-"the tip of the new branch."
+#, priority:240
+msgid "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:577
-msgid ""
-"When a merge conflict happens during switching branches with the `-m` "
-"option, you would see something like this:"
+#, priority:240
+msgid "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:583
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
"Auto-merging frotz\n"
@@ -14181,15 +12236,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:589
-msgid ""
-"At this point, `git diff` shows the changes cleanly merged as in the "
-"previous example, as well as the changes in the conflicted files. Edit and "
-"resolve the conflict and mark it resolved with `git add` as usual:"
+#, priority:240
+msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:"
msgstr ""
#. type: delimited block -
#: en/git-checkout.txt:593
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ edit frotz\n"
"$ git add frotz\n"
@@ -14203,19 +12256,19 @@ msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-check-ref-format(1)"
msgstr "git-check-ref-format(1)"
#. type: Plain text
#: en/git-check-ref-format.txt:7
+#, priority:100
msgid "git-check-ref-format - Ensures that a reference name is well formed"
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:15
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git check-ref-format' [--normalize]\n"
" [--[no-]allow-onelevel] [--refspec-pattern]\n"
@@ -14225,214 +12278,175 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:20
-msgid ""
-"Checks if a given 'refname' is acceptable, and exits with a non-zero status "
-"if it is not."
+#, priority:100
+msgid "Checks if a given 'refname' is acceptable, and exits with a non-zero status if it is not."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:27
-msgid ""
-"A reference is used in Git to specify branches and tags. A branch head is "
-"stored in the `refs/heads` hierarchy, while a tag is stored in the "
-"`refs/tags` hierarchy of the ref namespace (typically in "
-"`$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in "
-"file `$GIT_DIR/packed-refs` if refs are packed by `git gc`)."
+#, priority:100
+msgid "A reference is used in Git to specify branches and tags. A branch head is stored in the `refs/heads` hierarchy, while a tag is stored in the `refs/tags` hierarchy of the ref namespace (typically in `$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in file `$GIT_DIR/packed-refs` if refs are packed by `git gc`)."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:29
+#, priority:100
msgid "Git imposes the following rules on how references are named:"
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:33
-msgid ""
-"They can include slash `/` for hierarchical (directory) grouping, but no "
-"slash-separated component can begin with a dot `.` or end with the sequence "
-"`.lock`."
+#, priority:100
+msgid "They can include slash `/` for hierarchical (directory) grouping, but no slash-separated component can begin with a dot `.` or end with the sequence `.lock`."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:38
-msgid ""
-"They must contain at least one `/`. This enforces the presence of a category "
-"like `heads/`, `tags/` etc. but the actual names are not restricted. If the "
-"`--allow-onelevel` option is used, this rule is waived."
+#, priority:100
+msgid "They must contain at least one `/`. This enforces the presence of a category like `heads/`, `tags/` etc. but the actual names are not restricted. If the `--allow-onelevel` option is used, this rule is waived."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:40
+#, priority:100
msgid "They cannot have two consecutive dots `..` anywhere."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:44
-msgid ""
-"They cannot have ASCII control characters (i.e. bytes whose values are lower "
-"than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` "
-"anywhere."
+#, priority:100
+msgid "They cannot have ASCII control characters (i.e. bytes whose values are lower than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` anywhere."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:48
-msgid ""
-"They cannot have question-mark `?`, asterisk `*`, or open bracket `[` "
-"anywhere. See the `--refspec-pattern` option below for an exception to this "
-"rule."
+#, priority:100
+msgid "They cannot have question-mark `?`, asterisk `*`, or open bracket `[` anywhere. See the `--refspec-pattern` option below for an exception to this rule."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:52
-msgid ""
-"They cannot begin or end with a slash `/` or contain multiple consecutive "
-"slashes (see the `--normalize` option below for an exception to this rule)"
+#, priority:100
+msgid "They cannot begin or end with a slash `/` or contain multiple consecutive slashes (see the `--normalize` option below for an exception to this rule)"
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:54
+#, priority:100
msgid "They cannot end with a dot `.`."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:56
+#, priority:100
msgid "They cannot contain a sequence `@{`."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:58
+#, priority:100
msgid "They cannot be the single character `@`."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:60
+#, priority:100
msgid "They cannot contain a `\\`."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:65
-msgid ""
-"These rules make it easy for shell script based tools to parse reference "
-"names, pathname expansion by the shell when a reference name is used "
-"unquoted (by mistake), and also avoid ambiguities in certain reference name "
-"expressions (see linkgit:gitrevisions[7]):"
+#, priority:100
+msgid "These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used unquoted (by mistake), and also avoid ambiguities in certain reference name expressions (see linkgit:gitrevisions[7]):"
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:69
-msgid ""
-"A double-dot `..` is often used as in `ref1..ref2`, and in some contexts "
-"this notation means `^ref1 ref2` (i.e. not in `ref1` and in `ref2`)."
+#, priority:100
+msgid "A double-dot `..` is often used as in `ref1..ref2`, and in some contexts this notation means `^ref1 ref2` (i.e. not in `ref1` and in `ref2`)."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:72
-msgid ""
-"A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and "
-"'peel onion' operation."
+#, priority:100
+msgid "A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and 'peel onion' operation."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:77
-msgid ""
-"A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and "
-"store it in dstref\" in fetch and push operations. It may also be used to "
-"select a specific object such as with 'git cat-file': \"git cat-file blob "
-"v1.3.3:refs.c\"."
+#, priority:100
+msgid "A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and store it in dstref\" in fetch and push operations. It may also be used to select a specific object such as with 'git cat-file': \"git cat-file blob v1.3.3:refs.c\"."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:79
+#, priority:100
msgid "at-open-brace `@{` is used as a notation to access a reflog entry."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:98
-msgid ""
-"With the `--branch` option, the command takes a name and checks if it can be "
-"used as a valid branch name (e.g. when creating a new branch). But be "
-"cautious when using the previous checkout syntax that may refer to a "
-"detached HEAD state. The rule `git check-ref-format --branch $name` "
-"implements may be stricter than what `git check-ref-format refs/heads/$name` "
-"says (e.g. a dash may appear at the beginning of a ref component, but it is "
-"explicitly forbidden at the beginning of a branch name). When run with "
-"`--branch` option in a repository, the input is first expanded for the "
-"``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to "
-"refer the last thing that was checked out using \"git switch\" or \"git "
-"checkout\" operation. This option should be used by porcelains to accept "
-"this syntax anywhere a branch name is expected, so they can act as if you "
-"typed the branch name. As an exception note that, the ``previous checkout "
-"operation'' might result in a commit object name when the N-th last thing "
-"checked out was not a branch."
+#, priority:100
+msgid "With the `--branch` option, the command takes a name and checks if it can be used as a valid branch name (e.g. when creating a new branch). But be cautious when using the previous checkout syntax that may refer to a detached HEAD state. The rule `git check-ref-format --branch $name` implements may be stricter than what `git check-ref-format refs/heads/$name` says (e.g. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name). When run with `--branch` option in a repository, the input is first expanded for the ``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to refer the last thing that was checked out using \"git switch\" or \"git checkout\" operation. This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name. As an exception note that, the ``previous checkout operation'' might result in a commit object name when the N-th last thing checked out was not a branch."
msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:101
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]allow-onelevel"
msgstr "--[no-]allow-onelevel"
#. type: Plain text
#: en/git-check-ref-format.txt:105
-msgid ""
-"Controls whether one-level refnames are accepted (i.e., refnames that do not "
-"contain multiple `/`-separated components). The default is "
-"`--no-allow-onelevel`."
+#, priority:100
+msgid "Controls whether one-level refnames are accepted (i.e., refnames that do not contain multiple `/`-separated components). The default is `--no-allow-onelevel`."
msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:106
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
#. type: Plain text
#: en/git-check-ref-format.txt:112
-msgid ""
-"Interpret <refname> as a reference name pattern for a refspec (as used with "
-"remote repositories). If this option is enabled, <refname> is allowed to "
-"contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` "
-"but not `foo/bar*/baz*`)."
+#, priority:100
+msgid "Interpret <refname> as a reference name pattern for a refspec (as used with remote repositories). If this option is enabled, <refname> is allowed to contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` but not `foo/bar*/baz*`)."
msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:113
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--normalize"
msgstr "--normalize"
#. type: Plain text
#: en/git-check-ref-format.txt:120
-msgid ""
-"Normalize 'refname' by removing any leading slash (`/`) characters and "
-"collapsing runs of adjacent slashes between name components into a single "
-"slash. If the normalized refname is valid then print it to standard output "
-"and exit with a status of 0, otherwise exit with a non-zero status. "
-"(`--print` is a deprecated way to spell `--normalize`.)"
+#, priority:100
+msgid "Normalize 'refname' by removing any leading slash (`/`) characters and collapsing runs of adjacent slashes between name components into a single slash. If the normalized refname is valid then print it to standard output and exit with a status of 0, otherwise exit with a non-zero status. (`--print` is a deprecated way to spell `--normalize`.)"
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:126
+#, priority:100
msgid "Print the name of the previous thing checked out:"
msgstr ""
#. type: delimited block -
#: en/git-check-ref-format.txt:129
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git check-ref-format --branch @{-1}\n"
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:132
+#, priority:100
msgid "Determine the reference name to use for a new branch:"
msgstr ""
#. type: delimited block -
#: en/git-check-ref-format.txt:136
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ ref=$(git check-ref-format --normalize \"refs/heads/$newbranch\")||\n"
"{ echo \"we do not like '$newbranch' as a branch name.\" >&2 ; exit 1 ; }\n"
@@ -14440,19 +12454,19 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-cherry-pick(1)"
msgstr "git-cherry-pick(1)"
#. type: Plain text
#: en/git-cherry-pick.txt:7
+#, priority:100
msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n"
"\t\t [-S[<keyid>]] <commit>...\n"
@@ -14461,404 +12475,331 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:21
-msgid ""
-"Given one or more existing commits, apply the change each one introduces, "
-"recording a new commit for each. This requires your working tree to be "
-"clean (no modifications from the HEAD commit)."
+#, priority:100
+msgid "Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit)."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:24
+#, priority:100
msgid "When it is not obvious how to apply a change, the following happens:"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:27
-msgid ""
-"The current branch and `HEAD` pointer stay at the last commit successfully "
-"made."
+#, priority:100
+msgid "The current branch and `HEAD` pointer stay at the last commit successfully made."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:29
-msgid ""
-"The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the "
-"change that is difficult to apply."
+#, priority:100
+msgid "The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the change that is difficult to apply."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:31
-msgid ""
-"Paths in which the change applied cleanly are updated both in the index file "
-"and in your working tree."
+#, priority:100
+msgid "Paths in which the change applied cleanly are updated both in the index file and in your working tree."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:36
-msgid ""
-"For conflicting paths, the index file records up to three versions, as "
-"described in the \"TRUE MERGE\" section of linkgit:git-merge[1]. The "
-"working tree files will include a description of the conflict bracketed by "
-"the usual conflict markers `<<<<<<<` and `>>>>>>>`."
+#, priority:100
+msgid "For conflicting paths, the index file records up to three versions, as described in the \"TRUE MERGE\" section of linkgit:git-merge[1]. The working tree files will include a description of the conflict bracketed by the usual conflict markers `<<<<<<<` and `>>>>>>>`."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:37
+#, priority:100
msgid "No other modifications are made."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:40
+#, priority:100
msgid "See linkgit:git-merge[1] for some hints on resolving such conflicts."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:43 en/git-merge.txt:116 en/git-revert.txt:36 en/git-verify-commit.txt:27
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<commit>..."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:52
-msgid ""
-"Commits to cherry-pick. For a more complete list of ways to spell commits, "
-"see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal "
-"is done by default, as if the `--no-walk` option was specified, see "
-"linkgit:git-rev-list[1]. Note that specifying a range will feed all "
-"<commit>... arguments to a single revision walk (see a later example that "
-"uses 'maint master..next')."
+#, ignore-ellipsis, priority:100
+msgid "Commits to cherry-pick. For a more complete list of ways to spell commits, see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next')."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:57
-msgid ""
-"With this option, 'git cherry-pick' will let you edit the commit message "
-"prior to committing."
+#, priority:100
+msgid "With this option, 'git cherry-pick' will let you edit the commit message prior to committing."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:58 en/git-commit.txt:192 en/git-revert.txt:70 en/git-tag.txt:183 en/merge-options.txt:35
-#, no-wrap
+#, no-wrap, priority:280
msgid "--cleanup=<mode>"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:64 en/git-revert.txt:76
-msgid ""
-"This option determines how the commit message will be cleaned up before "
-"being passed on to the commit machinery. See linkgit:git-commit[1] for more "
-"details. In particular, if the '<mode>' is given a value of `scissors`, "
-"scissors will be appended to `MERGE_MSG` before being passed on in the case "
-"of a conflict."
+#, priority:100
+msgid "This option determines how the commit message will be cleaned up before being passed on to the commit machinery. See linkgit:git-commit[1] for more details. In particular, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on in the case of a conflict."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "-x"
msgstr "-x"
#. type: Plain text
#: en/git-cherry-pick.txt:78
-msgid ""
-"When recording the commit, append a line that says \"(cherry picked from "
-"commit ...)\" to the original commit message in order to indicate which "
-"commit this change was cherry-picked from. This is done only for cherry "
-"picks without conflicts. Do not use this option if you are cherry-picking "
-"from your private branch because the information is useless to the "
-"recipient. If on the other hand you are cherry-picking between two publicly "
-"visible branches (e.g. backporting a fix to a maintenance branch for an "
-"older release from a development branch), adding this information can be "
-"useful."
+#, ignore-ellipsis, priority:100
+msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:83
-msgid ""
-"It used to be that the command defaulted to do `-x` described above, and "
-"`-r` was to disable it. Now the default is not to do `-x` so this option is "
-"a no-op."
+#, priority:100
+msgid "It used to be that the command defaulted to do `-x` described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:84 en/git-revert.txt:50
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "-m parent-number"
msgstr "n첬mero-de-padre"
#. type: Labeled list
#: en/git-cherry-pick.txt:85 en/git-revert.txt:51
-#, no-wrap
+#, no-wrap, priority:100
msgid "--mainline parent-number"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:91
-msgid ""
-"Usually you cannot cherry-pick a merge because you do not know which side of "
-"the merge should be considered the mainline. This option specifies the "
-"parent number (starting from 1) of the mainline and allows cherry-pick to "
-"replay the change relative to the specified parent."
+#, priority:100
+msgid "Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-commit"
msgstr "--no-commit"
#. type: Plain text
#: en/git-cherry-pick.txt:101
-msgid ""
-"Usually the command automatically creates a sequence of commits. This flag "
-"applies the changes necessary to cherry-pick each named commit to your "
-"working tree and the index, without making any commit. In addition, when "
-"this option is used, your index does not have to match the HEAD commit. The "
-"cherry-pick is done against the beginning state of your index."
+#, priority:100
+msgid "Usually the command automatically creates a sequence of commits. This flag applies the changes necessary to cherry-pick each named commit to your working tree and the index, without making any commit. In addition, when this option is used, your index does not have to match the HEAD commit. The cherry-pick is done against the beginning state of your index."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:104
-msgid ""
-"This is useful when cherry-picking more than one commits' effect to your "
-"index in a row."
+#, priority:100
+msgid "This is useful when cherry-picking more than one commits' effect to your index in a row."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:109 en/git-revert.txt:101
-msgid ""
-"Add Signed-off-by line at the end of the commit message. See the signoff "
-"option in linkgit:git-commit[1] for more information."
+#, priority:100
+msgid "Add Signed-off-by line at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/merge-options.txt:42
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--ff"
msgstr "--ff"
#. type: Plain text
#: en/git-cherry-pick.txt:120
-msgid ""
-"If the current HEAD is the same as the parent of the cherry-pick'ed commit, "
-"then a fast forward to this commit will be performed."
+#, priority:100
+msgid "If the current HEAD is the same as the parent of the cherry-pick'ed commit, then a fast forward to this commit will be performed."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:121 en/git-commit.txt:180 en/git-notes.txt:158
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty"
msgstr "--allow-empty"
#. type: Plain text
#: en/git-cherry-pick.txt:133
-msgid ""
-"By default, cherry-picking an empty commit will fail, indicating that an "
-"explicit invocation of `git commit --allow-empty` is required. This option "
-"overrides that behavior, allowing empty commits to be preserved "
-"automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty "
-"commits that meet the \"fast-forward\" requirement will be kept even without "
-"this option. Note also, that use of this option only keeps commits that "
-"were initially empty (i.e. the commit recorded the same tree as its "
-"parent). Commits which are made empty due to a previous commit are "
-"dropped. To force the inclusion of those commits use "
-"`--keep-redundant-commits`."
+#, priority:100
+msgid "By default, cherry-picking an empty commit will fail, indicating that an explicit invocation of `git commit --allow-empty` is required. This option overrides that behavior, allowing empty commits to be preserved automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty commits that meet the \"fast-forward\" requirement will be kept even without this option. Note also, that use of this option only keeps commits that were initially empty (i.e. the commit recorded the same tree as its parent). Commits which are made empty due to a previous commit are dropped. To force the inclusion of those commits use `--keep-redundant-commits`."
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
-#, no-wrap
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
#. type: Plain text
#: en/git-cherry-pick.txt:138
-msgid ""
-"By default, cherry-picking a commit with an empty message will fail. This "
-"option overrides that behavior, allowing commits with empty messages to be "
-"cherry picked."
+#, priority:100
+msgid "By default, cherry-picking a commit with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be cherry picked."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:139
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
#. type: Plain text
#: en/git-cherry-pick.txt:145
-msgid ""
-"If a commit being cherry picked duplicates a commit already in the current "
-"history, it will become empty. By default these redundant commits cause "
-"`cherry-pick` to stop so the user can examine the commit. This option "
-"overrides that behavior and creates an empty commit object. Implies "
-"`--allow-empty`."
+#, priority:100
+msgid "If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these redundant commits cause `cherry-pick` to stop so the user can examine the commit. This option overrides that behavior and creates an empty commit object. Implies `--allow-empty`."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
-#, no-wrap
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:150 en/git-revert.txt:106
-msgid ""
-"Use the given merge strategy. Should only be used once. See the MERGE "
-"STRATEGIES section in linkgit:git-merge[1] for details."
+#, priority:100
+msgid "Use the given merge strategy. Should only be used once. See the MERGE STRATEGIES section in linkgit:git-merge[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:151 en/git-revert.txt:107
-#, no-wrap
+#, no-wrap, priority:100
msgid "-X<option>"
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
-#, no-wrap
+#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:155 en/git-revert.txt:111
-msgid ""
-"Pass the merge strategy-specific option through to the merge strategy. See "
-"linkgit:git-merge[1] for details."
+#, priority:100
+msgid "Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details."
msgstr ""
#. type: Title -
#: en/git-cherry-pick.txt:162 en/git-revert.txt:118
-#, no-wrap
+#, no-wrap, priority:100
msgid "SEQUENCER SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:167
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git cherry-pick master`"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:171
-msgid ""
-"Apply the change introduced by the commit at the tip of the master branch "
-"and create a new commit with this change."
+#, priority:100
+msgid "Apply the change introduced by the commit at the tip of the master branch and create a new commit with this change."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:172
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git cherry-pick ..master`"
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:173
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git cherry-pick ^HEAD master`"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:177
-msgid ""
-"Apply the changes introduced by all commits that are ancestors of master but "
-"not of HEAD to produce new commits."
+#, priority:100
+msgid "Apply the changes introduced by all commits that are ancestors of master but not of HEAD to produce new commits."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:178
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git cherry-pick maint next ^master`"
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:179
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git cherry-pick maint master..next`"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:186
-msgid ""
-"Apply the changes introduced by all commits that are ancestors of maint or "
-"next, but not master or any of its ancestors. Note that the latter does not "
-"mean `maint` and everything between `master` and `next`; specifically, "
-"`maint` will not be used if it is included in `master`."
+#, priority:100
+msgid "Apply the changes introduced by all commits that are ancestors of maint or next, but not master or any of its ancestors. Note that the latter does not mean `maint` and everything between `master` and `next`; specifically, `maint` will not be used if it is included in `master`."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:187
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git cherry-pick master~4 master~2`"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:192
-msgid ""
-"Apply the changes introduced by the fifth and third last commits pointed to "
-"by master and create 2 new commits with these changes."
+#, priority:100
+msgid "Apply the changes introduced by the fifth and third last commits pointed to by master and create 2 new commits with these changes."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:193
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git cherry-pick -n master~1 next`"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:199
-msgid ""
-"Apply to the working tree and the index the changes introduced by the second "
-"last commit pointed to by master and by the last commit pointed to by next, "
-"but do not create any commit with these changes."
+#, priority:100
+msgid "Apply to the working tree and the index the changes introduced by the second last commit pointed to by master and by the last commit pointed to by next, but do not create any commit with these changes."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:200
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git cherry-pick --ff ..next`"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:207
-msgid ""
-"If history is linear and HEAD is an ancestor of next, update the working "
-"tree and advance the HEAD pointer to match next. Otherwise, apply the "
-"changes introduced by those commits that are in next but not HEAD to the "
-"current branch, creating a new commit for each new change."
+#, priority:100
+msgid "If history is linear and HEAD is an ancestor of next, update the working tree and advance the HEAD pointer to match next. Otherwise, apply the changes introduced by those commits that are in next but not HEAD to the current branch, creating a new commit for each new change."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:208
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git rev-list --reverse master -- README | git cherry-pick -n --stdin`"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:214
-msgid ""
-"Apply the changes introduced by all commits on the master branch that "
-"touched README to the working tree and index, so the result can be inspected "
-"and made into a single new commit if suitable."
+#, priority:100
+msgid "Apply the changes introduced by all commits on the master branch that touched README to the working tree and index, so the result can be inspected and made into a single new commit if suitable."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:218
-msgid ""
-"The following sequence attempts to backport a patch, bails out because the "
-"code the patch applies to has changed too much, and then tries again, this "
-"time exercising more care about matching up context lines."
+#, priority:100
+msgid "The following sequence attempts to backport a patch, bails out because the code the patch applies to has changed too much, and then tries again, this time exercising more care about matching up context lines."
msgstr ""
#. type: delimited block -
#: en/git-cherry-pick.txt:224
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git cherry-pick topic^ <1>\n"
"$ git diff <2>\n"
@@ -14868,126 +12809,115 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:229
-msgid ""
-"apply the change that would be shown by `git show topic^`. In this example, "
-"the patch does not apply cleanly, so information about the conflict is "
-"written to the index and working tree and no new commit results."
+#, priority:100
+msgid "apply the change that would be shown by `git show topic^`. In this example, the patch does not apply cleanly, so information about the conflict is written to the index and working tree and no new commit results."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:230
+#, priority:100
msgid "summarize changes to be reconciled"
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:233
-msgid ""
-"cancel the cherry-pick. In other words, return to the pre-cherry-pick "
-"state, preserving any local modifications you had in the working tree."
+#, priority:100
+msgid "cancel the cherry-pick. In other words, return to the pre-cherry-pick state, preserving any local modifications you had in the working tree."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:236
-msgid ""
-"try to apply the change introduced by `topic^` again, spending extra time to "
-"avoid mistakes based on incorrectly matching context lines."
+#, priority:100
+msgid "try to apply the change introduced by `topic^` again, spending extra time to avoid mistakes based on incorrectly matching context lines."
msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-cherry(1)"
msgstr "git-cherry(1)"
#. type: Plain text
#: en/git-cherry.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-cherry - Find commits yet to be applied to upstream"
msgstr "Encuentra commits que faltan aplicar en upstream"
#. type: Plain text
#: en/git-cherry.txt:12
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
msgstr "git cherry [-v] [<upstream> [<head> [<l챠mite>]]]"
#. type: Plain text
#: en/git-cherry.txt:17
-msgid ""
-"Determine whether there are commits in `<head>..<upstream>` that are "
-"equivalent to those in the range `<limit>..<head>`."
+#, priority:100
+msgid "Determine whether there are commits in `<head>..<upstream>` that are equivalent to those in the range `<limit>..<head>`."
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:22
-msgid ""
-"The equivalence test is based on the diff, after removing whitespace and "
-"line numbers. git-cherry therefore detects when commits have been "
-"\"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or "
-"linkgit:git-rebase[1]."
+#, priority:100
+msgid "The equivalence test is based on the diff, after removing whitespace and line numbers. git-cherry therefore detects when commits have been \"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or linkgit:git-rebase[1]."
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:26
-msgid ""
-"Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for "
-"commits that have an equivalent in <upstream>, and `+` for commits that do "
-"not."
+#, priority:100
+msgid "Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for commits that have an equivalent in <upstream>, and `+` for commits that do not."
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:31
+#, priority:100
msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
#: en/git-cherry.txt:32 en/git-rebase.txt:238
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "<upstream>"
msgstr "upstream"
#. type: Plain text
#: en/git-cherry.txt:35
-msgid ""
-"Upstream branch to search for equivalent commits. Defaults to the upstream "
-"branch of HEAD."
+#, priority:100
+msgid "Upstream branch to search for equivalent commits. Defaults to the upstream branch of HEAD."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
-#, no-wrap
+#: en/git-cherry.txt:36 en/git.txt:383
+#, no-wrap, priority:100
msgid "<head>"
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:38 en/git-rebase.txt:245
+#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:41
+#, priority:100
msgid "Do not report commits up to (and including) limit."
msgstr ""
#. type: Title ~
#: en/git-cherry.txt:46
-#, no-wrap
+#, no-wrap, priority:100
msgid "Patch workflows"
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:52
-msgid ""
-"git-cherry is frequently used in patch-based workflows (see "
-"linkgit:gitworkflows[7]) to determine if a series of patches has been "
-"applied by the upstream maintainer. In such a workflow you might create and "
-"send a topic branch like this:"
+#, priority:100
+msgid "git-cherry is frequently used in patch-based workflows (see linkgit:gitworkflows[7]) to determine if a series of patches has been applied by the upstream maintainer. In such a workflow you might create and send a topic branch like this:"
msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:58
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git checkout -b topic origin/master\n"
"# work and create some commits\n"
@@ -14997,14 +12927,13 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:62
-msgid ""
-"Later, you can see whether your changes have been applied by saying (still "
-"on `topic`):"
+#, priority:100
+msgid "Later, you can see whether your changes have been applied by saying (still on `topic`):"
msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:66
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git fetch # update your notion of origin/master\n"
"$ git cherry -v\n"
@@ -15012,20 +12941,19 @@ msgstr ""
#. type: Title ~
#: en/git-cherry.txt:69
-#, no-wrap
+#, no-wrap, priority:100
msgid "Concrete example"
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:73
-msgid ""
-"In a situation where topic consisted of three commits, and the maintainer "
-"applied two of them, the situation might look like:"
+#, priority:100
+msgid "In a situation where topic consisted of three commits, and the maintainer applied two of them, the situation might look like:"
msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:86
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
"* 7654321 (origin/master) upstream tip commit\n"
@@ -15042,14 +12970,13 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:90
-msgid ""
-"In such cases, git-cherry shows a concise summary of what has yet to be "
-"applied:"
+#, priority:100
+msgid "In such cases, git-cherry shows a concise summary of what has yet to be applied:"
msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:96
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git cherry origin/master topic\n"
"- cccc000... commit C\n"
@@ -15059,30 +12986,25 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:102
-msgid ""
-"Here, we see that the commits A and C (marked with `-`) can be dropped from "
-"your `topic` branch when you rebase it on top of `origin/master`, while the "
-"commit B (marked with `+`) still needs to be kept so that it will be sent to "
-"be applied to `origin/master`."
+#, priority:100
+msgid "Here, we see that the commits A and C (marked with `-`) can be dropped from your `topic` branch when you rebase it on top of `origin/master`, while the commit B (marked with `+`) still needs to be kept so that it will be sent to be applied to `origin/master`."
msgstr ""
#. type: Title ~
#: en/git-cherry.txt:105
-#, no-wrap
+#, no-wrap, priority:100
msgid "Using a limit"
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:110
-msgid ""
-"The optional <limit> is useful in cases where your topic is based on other "
-"work that is not in upstream. Expanding on the previous example, this might "
-"look like:"
+#, priority:100
+msgid "The optional <limit> is useful in cases where your topic is based on other work that is not in upstream. Expanding on the previous example, this might look like:"
msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:126
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
"* 7654321 (origin/master) upstream tip commit\n"
@@ -15102,14 +13024,13 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:130
-msgid ""
-"By specifying `base` as the limit, you can avoid listing commits between "
-"`base` and `topic`:"
+#, priority:100
+msgid "By specifying `base` as the limit, you can avoid listing commits between `base` and `topic`:"
msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:136
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git cherry origin/master topic base\n"
"- cccc000... commit C\n"
@@ -15119,179 +13040,151 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-citool(1)"
msgstr "git-citool(1)"
#. type: Plain text
#: en/git-citool.txt:7
+#, priority:100
msgid "git-citool - Graphical alternative to git-commit"
msgstr ""
#. type: Plain text
#: en/git-citool.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git citool'\n"
msgstr ""
#. type: Plain text
#: en/git-citool.txt:19
-msgid ""
-"A Tcl/Tk based graphical interface to review modified files, stage them into "
-"the index, enter a commit message and record the new commit onto the current "
-"branch. This interface is an alternative to the less interactive 'git "
-"commit' program."
+#, priority:100
+msgid "A Tcl/Tk based graphical interface to review modified files, stage them into the index, enter a commit message and record the new commit onto the current branch. This interface is an alternative to the less interactive 'git commit' program."
msgstr ""
#. type: Plain text
#: en/git-citool.txt:22
-msgid ""
-"'git citool' is actually a standard alias for `git gui citool`. See "
-"linkgit:git-gui[1] for more details."
+#, priority:100
+msgid "'git citool' is actually a standard alias for `git gui citool`. See linkgit:git-gui[1] for more details."
msgstr ""
#. type: Title =
#: en/git-clean.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-clean(1)"
msgstr "git-clean(1)"
#. type: Plain text
#: en/git-clean.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-clean - Remove untracked files from the working tree"
msgstr "Remueve archivos del 찼rbol de trabajo no rastreados"
#. type: Plain text
#: en/git-clean.txt:12
-#, fuzzy, no-wrap
-msgid ""
-"'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
-"<path>...\n"
-msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <patr처n>] [-x | -X] [--] <rutas>..."
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
+msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <patr처n>] [-x | -X] [--] <rutas>..."
#. type: Plain text
#: en/git-clean.txt:18
-msgid ""
-"Cleans the working tree by recursively removing files that are not under "
-"version control, starting from the current directory."
+#, priority:100
+msgid "Cleans the working tree by recursively removing files that are not under version control, starting from the current directory."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:22
-msgid ""
-"Normally, only files unknown to Git are removed, but if the `-x` option is "
-"specified, ignored files are also removed. This can, for example, be useful "
-"to remove all build products."
+#, priority:100
+msgid "Normally, only files unknown to Git are removed, but if the `-x` option is specified, ignored files are also removed. This can, for example, be useful to remove all build products."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:25
-msgid ""
-"If any optional `<path>...` arguments are given, only those paths are "
-"affected."
+#, ignore-ellipsis, priority:100
+msgid "If any optional `<path>...` arguments are given, only those paths are affected."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:35
-msgid ""
-"Normally, when no <path> is specified, git clean will not recurse into "
-"untracked directories to avoid removing too much. Specify -d to have it "
-"recurse into such directories as well. If any paths are specified, -d is "
-"irrelevant; all untracked files matching the specified paths (with "
-"exceptions for nested git directories mentioned under `--force`) will be "
-"removed."
+#, priority:100
+msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:43
-msgid ""
-"If the Git configuration variable clean.requireForce is not set to false, "
-"'git clean' will refuse to delete files or directories unless given -f or "
-"-i. Git will refuse to modify untracked nested git repositories "
-"(directories with a .git subdirectory) unless a second -f is given."
+#, priority:100
+msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:48
-msgid ""
-"Show what would be done and clean files interactively. See ``Interactive "
-"mode'' for details."
+#, priority:100
+msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:52
+#, priority:100
msgid "Don't actually remove anything, just show what would be done."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:57
-msgid ""
-"Be quiet, only report errors, but not the files that are successfully "
-"removed."
+#, priority:100
+msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:58
-#, no-wrap
+#, no-wrap, priority:100
msgid "-e <pattern>"
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:59 en/git-ls-files.txt:85 en/git-name-rev.txt:33
-#, no-wrap
+#, no-wrap, priority:100
msgid "--exclude=<pattern>"
msgstr ""
#. type: Plain text
#: en/git-clean.txt:62
-msgid ""
-"Use the given exclude pattern in addition to the standard ignore rules (see "
-"linkgit:gitignore[5])."
+#, priority:100
+msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:70
-msgid ""
-"Don't use the standard ignore rules (see linkgit:gitignore[5]), but still "
-"use the ignore rules given with `-e` options from the command line. This "
-"allows removing all untracked files, including build products. This can be "
-"used (possibly in conjunction with 'git restore' or 'git reset') to create a "
-"pristine working directory to test a clean build."
+#, priority:100
+msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:71
-#, no-wrap
+#, no-wrap, priority:100
msgid "-X"
msgstr ""
#. type: Plain text
#: en/git-clean.txt:74
-msgid ""
-"Remove only files ignored by Git. This may be useful to rebuild everything "
-"from scratch, but keep manually created files."
+#, priority:100
+msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Title -
#: en/git-clean.txt:76
-#, no-wrap
+#, no-wrap, priority:100
msgid "Interactive mode"
msgstr ""
#. type: Plain text
#: en/git-clean.txt:80
-msgid ""
-"When the command enters the interactive mode, it shows the files and "
-"directories to be cleaned, and goes into its interactive command loop."
+#, priority:100
+msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
msgstr ""
#. type: delimited block -
#: en/git-clean.txt:91
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" *** Commands ***\n"
"\t1: clean 2: filter by pattern 3: select by numbers\n"
@@ -15301,93 +13194,85 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:94
+#, priority:100
msgid "You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:96
+#, priority:100
msgid "The main command loop has 6 subcommands."
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:97
-#, no-wrap
+#, no-wrap, priority:100
msgid "clean"
msgstr ""
#. type: Plain text
#: en/git-clean.txt:100
+#, priority:100
msgid "Start cleaning files and directories, and then quit."
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:101
-#, no-wrap
+#, no-wrap, priority:100
msgid "filter by pattern"
msgstr ""
#. type: Plain text
#: en/git-clean.txt:109
-msgid ""
-"This shows the files and directories to be deleted and issues an \"Input "
-"ignore patterns>>\" prompt. You can input space-separated patterns to "
-"exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes "
-"files end with \".c\" and \".h\" from deletion. When you are satisfied with "
-"the filtered result, press ENTER (empty) back to the main menu."
+#, priority:100
+msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:110
-#, no-wrap
+#, no-wrap, priority:100
msgid "select by numbers"
msgstr ""
#. type: Plain text
#: en/git-clean.txt:121
-msgid ""
-"This shows the files and directories to be deleted and issues an \"Select "
-"items to delete>>\" prompt. When the prompt ends with double '>>' like this, "
-"you can make more than one selection, concatenated with whitespace or "
-"comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 "
-"from the list. If the second number in a range is omitted, all remaining "
-"items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say "
-"'*' to choose everything. Also when you are satisfied with the filtered "
-"result, press ENTER (empty) back to the main menu."
+#, priority:100
+msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:122
-#, no-wrap
+#, no-wrap, priority:100
msgid "ask each"
msgstr ""
#. type: Plain text
#: en/git-clean.txt:127
-msgid ""
-"This will start to clean, and you must confirm one by one in order to delete "
-"items. Please note that this action is not as efficient as the above two "
-"actions."
+#, priority:100
+msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:128
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "quit"
msgstr "tranquilo"
#. type: Plain text
#: en/git-clean.txt:131
+#, priority:100
msgid "This lets you quit without do cleaning."
msgstr ""
#. type: Labeled list
#: en/git-clean.txt:132
-#, no-wrap
+#, no-wrap, priority:100
msgid "help"
msgstr ""
#. type: Plain text
#: en/git-clean.txt:135
+#, priority:100
msgid "Show brief usage of interactive git-clean."
msgstr ""
@@ -15399,20 +13284,19 @@ msgstr "linkgit:gitignore[5]"
#. type: Title =
#: en/git-clone.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "git-clone(1)"
msgstr "git-clone(1)"
#. type: Plain text
#: en/git-clone.txt:7
-#, fuzzy
+#, fuzzy, priority:300
msgid "git-clone - Clone a repository into a new directory"
msgstr "Clona un repositorio dentro de un nuevo directorio"
#. type: Plain text
#: en/git-clone.txt:20
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"'git clone' [--template=<template_directory>]\n"
"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
@@ -15426,100 +13310,74 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:29
-msgid ""
-"Clones a repository into a newly created directory, creates remote-tracking "
-"branches for each branch in the cloned repository (visible using `git branch "
-"--remotes`), and creates and checks out an initial branch that is forked "
-"from the cloned repository's currently active branch."
+#, priority:300
+msgid "Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository (visible using `git branch --remotes`), and creates and checks out an initial branch that is forked from the cloned repository's currently active branch."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:35
-msgid ""
-"After the clone, a plain `git fetch` without arguments will update all the "
-"remote-tracking branches, and a `git pull` without arguments will in "
-"addition merge the remote master branch into the current master branch, if "
-"any (this is untrue when \"--single-branch\" is given; see below)."
+#, priority:300
+msgid "After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the current master branch, if any (this is untrue when \"--single-branch\" is given; see below)."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:40
-msgid ""
-"This default configuration is achieved by creating references to the remote "
-"branch heads under `refs/remotes/origin` and by initializing "
-"`remote.origin.url` and `remote.origin.fetch` configuration variables."
+#, priority:300
+msgid "This default configuration is achieved by creating references to the remote branch heads under `refs/remotes/origin` and by initializing `remote.origin.url` and `remote.origin.fetch` configuration variables."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:45 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--local"
msgstr "--local"
#. type: Plain text
#: en/git-clone.txt:52
-msgid ""
-"When the repository to clone from is on a local machine, this flag bypasses "
-"the normal \"Git aware\" transport mechanism and clones the repository by "
-"making a copy of HEAD and everything under objects and refs directories. "
-"The files under `.git/objects/` directory are hardlinked to save space when "
-"possible."
+#, priority:300
+msgid "When the repository to clone from is on a local machine, this flag bypasses the normal \"Git aware\" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. The files under `.git/objects/` directory are hardlinked to save space when possible."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:59
-msgid ""
-"If the repository is specified as a local path (e.g., `/path/to/repo`), this "
-"is the default, and --local is essentially a no-op. If the repository is "
-"specified as a URL, then this flag is ignored (and we never use the local "
-"optimizations). Specifying `--no-local` will override the default when "
-"`/path/to/repo` is given, using the regular Git transport instead."
+#, priority:300
+msgid "If the repository is specified as a local path (e.g., `/path/to/repo`), this is the default, and --local is essentially a no-op. If the repository is specified as a URL, then this flag is ignored (and we never use the local optimizations). Specifying `--no-local` will override the default when `/path/to/repo` is given, using the regular Git transport instead."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
#. type: Plain text
#: en/git-clone.txt:65
-msgid ""
-"Force the cloning process from a repository on a local filesystem to copy "
-"the files under the `.git/objects` directory instead of using "
-"hardlinks. This may be desirable if you are trying to make a back-up of your "
-"repository."
+#, priority:300
+msgid "Force the cloning process from a repository on a local filesystem to copy the files under the `.git/objects` directory instead of using hardlinks. This may be desirable if you are trying to make a back-up of your repository."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:67
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--shared"
msgstr "--shared"
#. type: Plain text
#: en/git-clone.txt:73
-msgid ""
-"When the repository to clone is on the local machine, instead of using hard "
-"links, automatically setup `.git/objects/info/alternates` to share the "
-"objects with the source repository. The resulting repository starts out "
-"without any object of its own."
+#, priority:300
+msgid "When the repository to clone is on the local machine, instead of using hard links, automatically setup `.git/objects/info/alternates` to share the objects with the source repository. The resulting repository starts out without any object of its own."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:83
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"*NOTE*: this is a possibly dangerous operation; do *not* use\n"
"it unless you understand what it does. If you clone your\n"
"repository using this option and then delete branches (or use any\n"
"other Git command that makes any existing commit unreferenced) in the\n"
"source repository, some objects may become unreferenced (or dangling).\n"
-"These objects may be removed by normal Git operations (such as `git "
-"commit`)\n"
+"These objects may be removed by normal Git operations (such as `git commit`)\n"
"which automatically call `git gc --auto`. (See linkgit:git-gc[1].)\n"
"If these objects are removed and were referenced by the cloned repository,\n"
"then the cloned repository will become corrupt.\n"
@@ -15527,43 +13385,31 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:89
-msgid ""
-"Note that running `git repack` without the `--local` option in a repository "
-"cloned with `--shared` will copy objects from the source repository into a "
-"pack in the cloned repository, removing the disk space savings of `clone "
-"--shared`. It is safe, however, to run `git gc`, which uses the `--local` "
-"option by default."
+#, priority:300
+msgid "Note that running `git repack` without the `--local` option in a repository cloned with `--shared` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone --shared`. It is safe, however, to run `git gc`, which uses the `--local` option by default."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:93
-msgid ""
-"If you want to break the dependency of a repository cloned with `--shared` "
-"on its source repository, you can simply run `git repack -a` to copy all "
-"objects from the source repository into a pack in the cloned repository."
+#, priority:300
+msgid "If you want to break the dependency of a repository cloned with `--shared` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:94
-#, no-wrap
+#, no-wrap, priority:300
msgid "--reference[-if-able] <repository>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:104
-msgid ""
-"If the reference repository is on the local machine, automatically setup "
-"`.git/objects/info/alternates` to obtain objects from the reference "
-"repository. Using an already existing repository as an alternate will "
-"require fewer objects to be copied from the repository being cloned, "
-"reducing network and local storage costs. When using the "
-"`--reference-if-able`, a non existing directory is skipped with a warning "
-"instead of aborting the clone."
+#, priority:300
+msgid "If the reference repository is on the local machine, automatically setup `.git/objects/info/alternates` to obtain objects from the reference repository. Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs. When using the `--reference-if-able`, a non existing directory is skipped with a warning instead of aborting the clone."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:107
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"*NOTE*: see the NOTE for the `--shared` option, and also the\n"
"`--dissociate` option.\n"
@@ -15571,392 +13417,313 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:108 en/git-submodule.txt:403
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--dissociate"
msgstr "--dissociate"
#. type: Plain text
#: en/git-clone.txt:118
-msgid ""
-"Borrow the objects from reference repositories specified with the "
-"`--reference` options only to reduce network transfer, and stop borrowing "
-"from them after a clone is made by making necessary local copies of borrowed "
-"objects. This option can also be used when cloning locally from a "
-"repository that already borrows objects from another repository--the new "
-"repository will borrow objects from the same repository, and this option can "
-"be used to stop the borrowing."
+#, priority:300
+msgid "Borrow the objects from reference repositories specified with the `--reference` options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects. This option can also be used when cloning locally from a repository that already borrows objects from another repository--the new repository will borrow objects from the same repository, and this option can be used to stop the borrowing."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:123
+#, priority:300
msgid "Operate quietly. Progress is not reported to the standard error stream."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:128
-msgid ""
-"Run verbosely. Does not affect the reporting of progress status to the "
-"standard error stream."
+#, priority:300
+msgid "Run verbosely. Does not affect the reporting of progress status to the standard error stream."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:134
-msgid ""
-"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless `--quiet` is specified. This flag forces "
-"progress status even if the standard error stream is not directed to a "
-"terminal."
+#, priority:300
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:146
+#, priority:300
msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
-#, no-wrap
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
#. type: Plain text
#: en/git-clone.txt:158
-msgid ""
-"Make a 'bare' Git repository. That is, instead of creating `<directory>` "
-"and placing the administrative files in `<directory>/.git`, make the "
-"`<directory>` itself the `$GIT_DIR`. This obviously implies the "
-"`--no-checkout` because there is nowhere to check out the working tree. "
-"Also the branch heads at the remote are copied directly to corresponding "
-"local branch heads, without mapping them to `refs/remotes/origin/`. When "
-"this option is used, neither remote-tracking branches nor the related "
-"configuration variables are created."
+#, priority:300
+msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:159 en/git-pack-objects.txt:199 en/git-show-branch.txt:67 en/rev-list-options.txt:352 en/rev-list-options.txt:485
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--sparse"
msgstr "--sparse"
#. type: Plain text
#: en/git-clone.txt:164
-msgid ""
-"Initialize the sparse-checkout file so the working directory starts with "
-"only the files in the root of the repository. The sparse-checkout file can "
-"be modified to grow the working directory as needed."
+#, priority:300
+msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:165 en/git-push.txt:161
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--mirror"
msgstr "--mirror"
#. type: Plain text
#: en/git-clone.txt:172
-msgid ""
-"Set up a mirror of the source repository. This implies `--bare`. Compared "
-"to `--bare`, `--mirror` not only maps local branches of the source to local "
-"branches of the target, it maps all refs (including remote-tracking "
-"branches, notes etc.) and sets up a refspec configuration such that all "
-"these refs are overwritten by a `git remote update` in the target "
-"repository."
+#, priority:300
+msgid "Set up a mirror of the source repository. This implies `--bare`. Compared to `--bare`, `--mirror` not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a `git remote update` in the target repository."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:173
-#, no-wrap
+#, no-wrap, priority:300
msgid "-o <name>"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:174
-#, no-wrap
+#, no-wrap, priority:300
msgid "--origin <name>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:177
-msgid ""
-"Instead of using the remote name `origin` to keep track of the upstream "
-"repository, use `<name>`."
+#, priority:300
+msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:178
-#, no-wrap
+#, no-wrap, priority:300
msgid "-b <name>"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:179
-#, no-wrap
+#, no-wrap, priority:300
msgid "--branch <name>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:186
-msgid ""
-"Instead of pointing the newly created HEAD to the branch pointed to by the "
-"cloned repository's HEAD, point to `<name>` branch instead. In a non-bare "
-"repository, this is the branch that will be checked out. `--branch` can "
-"also take tags and detaches the HEAD at that commit in the resulting "
-"repository."
+#, priority:300
+msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to `<name>` branch instead. In a non-bare repository, this is the branch that will be checked out. `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:187
-#, no-wrap
+#, no-wrap, priority:300
msgid "-u <upload-pack>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:192
-msgid ""
-"When given, and the repository to clone from is accessed via ssh, this "
-"specifies a non-default path for the command run on the other end."
+#, priority:300
+msgid "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:193 en/git-init.txt:51 en/git-svn.txt:578
-#, no-wrap
+#, no-wrap, priority:300
msgid "--template=<template_directory>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:196
-msgid ""
-"Specify the directory from which templates will be used; (See the \"TEMPLATE "
-"DIRECTORY\" section of linkgit:git-init[1].)"
+#, priority:300
+msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:197
-#, no-wrap
+#, no-wrap, priority:300
msgid "-c <key>=<value>"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:198
-#, no-wrap
+#, no-wrap, priority:300
msgid "--config <key>=<value>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:207
-msgid ""
-"Set a configuration variable in the newly-created repository; this takes "
-"effect immediately after the repository is initialized, but before the "
-"remote history is fetched or any files checked out. The key is in the same "
-"format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If "
-"multiple values are given for the same key, each value will be written to "
-"the config file. This makes it safe, for example, to add additional fetch "
-"refspecs to the origin remote."
+#, priority:300
+msgid "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:213
-msgid ""
-"Due to limitations of the current implementation, some configuration "
-"variables do not take effect until after the initial fetch and checkout. "
-"Configuration variables known to not take effect are: `remote.<name>.mirror` "
-"and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and "
-"`--no-tags` options instead."
+#, priority:300
+msgid "Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: `remote.<name>.mirror` and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and `--no-tags` options instead."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:214
-#, no-wrap
+#, no-wrap, priority:300
msgid "--depth <depth>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:220
-msgid ""
-"Create a 'shallow' clone with a history truncated to the specified number of "
-"commits. Implies `--single-branch` unless `--no-single-branch` is given to "
-"fetch the histories near the tips of all branches. If you want to clone "
-"submodules shallowly, also pass `--shallow-submodules`."
+#, priority:300
+msgid "Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:223
+#, priority:300
msgid "Create a shallow clone with a history after the specified time."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:228
-msgid ""
-"Create a shallow clone with a history, excluding commits reachable from a "
-"specified remote branch or tag. This option can be specified multiple "
-"times."
+#, priority:300
+msgid "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
-#, no-wrap
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
#. type: Plain text
#: en/git-clone.txt:238
-msgid ""
-"Clone only the history leading to the tip of a single branch, either "
-"specified by the `--branch` option or the primary branch remote's `HEAD` "
-"points at. Further fetches into the resulting repository will only update "
-"the remote-tracking branch for the branch this option was used for the "
-"initial cloning. If the HEAD at the remote did not point at any branch when "
-"`--single-branch` clone was made, no remote-tracking branch is created."
+#, priority:300
+msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:245
-msgid ""
-"Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the "
-"config, ensuring that future `git pull` and `git fetch` operations won't "
-"follow any tags. Subsequent explicit tag fetches will still work, (see "
-"linkgit:git-fetch[1])."
+#, priority:300
+msgid "Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the config, ensuring that future `git pull` and `git fetch` operations won't follow any tags. Subsequent explicit tag fetches will still work, (see linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:250
-msgid ""
-"Can be used in conjunction with `--single-branch` to clone and maintain a "
-"branch with no references other than a single cloned branch. This is useful "
-"e.g. to maintain minimal clones of the default branch of some repository for "
-"search indexing."
+#, priority:300
+msgid "Can be used in conjunction with `--single-branch` to clone and maintain a branch with no references other than a single cloned branch. This is useful e.g. to maintain minimal clones of the default branch of some repository for search indexing."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:251
-#, no-wrap
+#, no-wrap, priority:300
msgid "--recurse-submodules[=<pathspec]"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:259
-msgid ""
-"After the clone is created, initialize and clone submodules within based on "
-"the provided pathspec. If no pathspec is provided, all submodules are "
-"initialized and cloned. This option can be given multiple times for "
-"pathspecs consisting of multiple entries. The resulting clone has "
-"`submodule.active` set to the provided pathspec, or \".\" (meaning all "
-"submodules) if no pathspec is provided."
+#, priority:300
+msgid "After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries. The resulting clone has `submodule.active` set to the provided pathspec, or \".\" (meaning all submodules) if no pathspec is provided."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:266
-msgid ""
-"Submodules are initialized and cloned using their default settings. This is "
-"equivalent to running `git submodule update --init --recursive <pathspec>` "
-"immediately after the clone is finished. This option is ignored if the "
-"cloned repository does not have a worktree/checkout (i.e. if any of "
-"`--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
+#, priority:300
+msgid "Submodules are initialized and cloned using their default settings. This is equivalent to running `git submodule update --init --recursive <pathspec>` immediately after the clone is finished. This option is ignored if the cloned repository does not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:267
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
#. type: Plain text
#: en/git-clone.txt:269
+#, priority:300
msgid "All submodules which are cloned will be shallow with a depth of 1."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:270
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "--[no-]remote-submodules"
msgstr "--[no-]remote-submodules"
#. type: Plain text
#: en/git-clone.txt:275
-msgid ""
-"All submodules which are cloned will use the status of the submodule's "
-"remote-tracking branch to update the submodule, rather than the "
-"superproject's recorded SHA-1. Equivalent to passing `--remote` to `git "
-"submodule update`."
+#, priority:300
+msgid "All submodules which are cloned will use the status of the submodule's remote-tracking branch to update the submodule, rather than the superproject's recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:276 en/git-init.txt:56
-#, no-wrap
+#, no-wrap, priority:300
msgid "--separate-git-dir=<git dir>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:282
-msgid ""
-"Instead of placing the cloned repository where it is supposed to be, place "
-"the cloned repository at the specified directory, then make a "
-"filesystem-agnostic Git symbolic link to there. The result is Git "
-"repository can be separated from working tree."
+#, priority:300
+msgid "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:283 en/git-submodule.txt:427
-#, no-wrap
+#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:284 en/git-submodule.txt:428
-#, no-wrap
+#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:287
-msgid ""
-"The number of submodules fetched at the same time. Defaults to the "
-"`submodule.fetchJobs` option."
+#, priority:300
+msgid "The number of submodules fetched at the same time. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
-#, fuzzy, no-wrap
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#, fuzzy, no-wrap, priority:300
msgid "<repository>"
msgstr "repositorio"
#. type: Plain text
#: en/git-clone.txt:292
-msgid ""
-"The (possibly remote) repository to clone from. See the <<URLS,GIT URLS>> "
-"section below for more information on specifying repositories."
+#, priority:300
+msgid "The (possibly remote) repository to clone from. See the <<URLS,GIT URLS>> section below for more information on specifying repositories."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:293 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
-#, no-wrap
+#, no-wrap, priority:300
msgid "<directory>"
msgstr ""
#. type: Plain text
#: en/git-clone.txt:299
-msgid ""
-"The name of a new directory to clone into. The \"humanish\" part of the "
-"source repository is used if no directory is explicitly given (`repo` for "
-"`/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an "
-"existing directory is only allowed if the directory is empty."
+#, priority:300
+msgid "The name of a new directory to clone into. The \"humanish\" part of the source repository is used if no directory is explicitly given (`repo` for `/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an existing directory is only allowed if the directory is empty."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:307
+#, priority:300
msgid "Clone from upstream:"
msgstr ""
#. type: delimited block -
#: en/git-clone.txt:312
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
"$ cd my-linux\n"
@@ -15965,14 +13732,13 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:316
-msgid ""
-"Make a local clone that borrows from the current directory, without checking "
-"things out:"
+#, priority:300
+msgid "Make a local clone that borrows from the current directory, without checking things out:"
msgstr ""
#. type: delimited block -
#: en/git-clone.txt:321
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"$ git clone -l -s -n . ../copy\n"
"$ cd ../copy\n"
@@ -15981,12 +13747,13 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:325
+#, priority:300
msgid "Clone from upstream while borrowing from an existing local directory:"
msgstr ""
#. type: delimited block -
#: en/git-clone.txt:331
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone --reference /git/linux.git \\\n"
"\tgit://git.kernel.org/pub/scm/.../linux.git \\\n"
@@ -15996,30 +13763,31 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:335
+#, priority:300
msgid "Create a bare repository to publish your changes to the public:"
msgstr ""
#. type: delimited block -
#: en/git-clone.txt:338
-#, no-wrap
+#, no-wrap, priority:300
msgid "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
msgstr ""
#. type: Title =
#: en/git-column.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-column(1)"
msgstr "git-column(1)"
#. type: Plain text
#: en/git-column.txt:7
+#, priority:100
msgid "git-column - Display data in columns"
msgstr ""
#. type: Plain text
#: en/git-column.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]\n"
"\t [--indent=<string>] [--nl=<string>] [--padding=<n>]\n"
@@ -16027,105 +13795,103 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:20
-msgid ""
-"This command formats the lines of its standard input into a table with "
-"multiple columns. Each input line occupies one cell of the table. It is used "
-"internally by other git commands to format output into columns."
+#, priority:100
+msgid "This command formats the lines of its standard input into a table with multiple columns. Each input line occupies one cell of the table. It is used internally by other git commands to format output into columns."
msgstr ""
#. type: Labeled list
#: en/git-column.txt:23
-#, no-wrap
+#, no-wrap, priority:100
msgid "--command=<name>"
msgstr ""
#. type: Plain text
#: en/git-column.txt:26
-msgid ""
-"Look up layout mode using configuration variable column.<name> and "
-"column.ui."
+#, priority:100
+msgid "Look up layout mode using configuration variable column.<name> and column.ui."
msgstr ""
#. type: Labeled list
#: en/git-column.txt:27
-#, no-wrap
+#, no-wrap, priority:100
msgid "--mode=<mode>"
msgstr ""
#. type: Plain text
#: en/git-column.txt:30
-msgid ""
-"Specify layout mode. See configuration variable column.ui for option syntax "
-"in linkgit:git-config[1]."
+#, priority:100
+msgid "Specify layout mode. See configuration variable column.ui for option syntax in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-column.txt:31
-#, no-wrap
+#, no-wrap, priority:100
msgid "--raw-mode=<n>"
msgstr ""
#. type: Plain text
#: en/git-column.txt:34
-msgid ""
-"Same as --mode but take mode encoded as a number. This is mainly used by "
-"other commands that have already parsed layout mode."
+#, priority:100
+msgid "Same as --mode but take mode encoded as a number. This is mainly used by other commands that have already parsed layout mode."
msgstr ""
#. type: Labeled list
#: en/git-column.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid "--width=<width>"
msgstr ""
#. type: Plain text
#: en/git-column.txt:38
-msgid ""
-"Specify the terminal width. By default 'git column' will detect the terminal "
-"width, or fall back to 80 if it is unable to do so."
+#, priority:100
+msgid "Specify the terminal width. By default 'git column' will detect the terminal width, or fall back to 80 if it is unable to do so."
msgstr ""
#. type: Labeled list
#: en/git-column.txt:39
-#, no-wrap
+#, no-wrap, priority:100
msgid "--indent=<string>"
msgstr ""
#. type: Plain text
#: en/git-column.txt:41
+#, priority:100
msgid "String to be printed at the beginning of each line."
msgstr ""
#. type: Labeled list
#: en/git-column.txt:42
-#, no-wrap
+#, no-wrap, priority:100
msgid "--nl=<N>"
msgstr ""
#. type: Plain text
#: en/git-column.txt:45
+#, priority:100
msgid "String to be printed at the end of each line, including newline character."
msgstr ""
#. type: Labeled list
#: en/git-column.txt:46
-#, no-wrap
+#, no-wrap, priority:100
msgid "--padding=<N>"
msgstr ""
#. type: Plain text
#: en/git-column.txt:48
+#, priority:100
msgid "The number of spaces between columns. One space by default."
msgstr ""
#. type: Plain text
#: en/git-column.txt:53
+#, priority:100
msgid "Format data by columns:"
msgstr ""
#. type: delimited block -
#: en/git-column.txt:58
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ seq 1 24 | git column --mode=column --padding=5\n"
"1 4 7 10 13 16 19 22\n"
@@ -16135,12 +13901,13 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:61
+#, priority:100
msgid "Format data by rows:"
msgstr ""
#. type: delimited block -
#: en/git-column.txt:66
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ seq 1 21 | git column --mode=row --padding=5\n"
"1 2 3 4 5 6 7\n"
@@ -16150,12 +13917,13 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:69
+#, priority:100
msgid "List some tags in a table with unequal column widths:"
msgstr ""
#. type: delimited block -
#: en/git-column.txt:75
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git tag --list 'v2.4.*' --column=row,dense\n"
"v2.4.0 v2.4.0-rc0 v2.4.0-rc1 v2.4.0-rc2 v2.4.0-rc3\n"
@@ -16166,19 +13934,19 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-commit-tree(1)"
msgstr "git-commit-tree(1)"
#. type: Plain text
#: en/git-commit-tree.txt:7
+#, priority:100
msgid "git-commit-tree - Create a new commit object"
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:15
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git commit-tree' <tree> [(-p <parent>)...]\n"
"'git commit-tree' [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
@@ -16187,215 +13955,175 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:21
-msgid ""
-"This is usually not what an end user wants to run directly. See "
-"linkgit:git-commit[1] instead."
+#, priority:100
+msgid "This is usually not what an end user wants to run directly. See linkgit:git-commit[1] instead."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:25
-msgid ""
-"Creates a new commit object based on the provided tree object and emits the "
-"new commit object id on stdout. The log message is read from the standard "
-"input, unless `-m` or `-F` options are given."
+#, priority:100
+msgid "Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. The log message is read from the standard input, unless `-m` or `-F` options are given."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:29
-msgid ""
-"The `-m` and `-F` options can be given any number of times, in any "
-"order. The commit log message will be composed in the order in which the "
-"options are given."
+#, priority:100
+msgid "The `-m` and `-F` options can be given any number of times, in any order. The commit log message will be composed in the order in which the options are given."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:34
-msgid ""
-"A commit object may have any number of parents. With exactly one parent, it "
-"is an ordinary commit. Having more than one parent makes the commit a merge "
-"between several lines of history. Initial (root) commits have no parents."
+#, priority:100
+msgid "A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) commits have no parents."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:38
-msgid ""
-"While a tree represents a particular directory state of a working directory, "
-"a commit represents that state in \"time\", and explains how to get there."
+#, priority:100
+msgid "While a tree represents a particular directory state of a working directory, a commit represents that state in \"time\", and explains how to get there."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:44
-msgid ""
-"Normally a commit would identify a new \"HEAD\" state, and while Git doesn't "
-"care where you save the note about that state, in practice we tend to just "
-"write the result to the file that is pointed at by `.git/HEAD`, so that we "
-"can always see what the last committed state was."
+#, priority:100
+msgid "Normally a commit would identify a new \"HEAD\" state, and while Git doesn't care where you save the note about that state, in practice we tend to just write the result to the file that is pointed at by `.git/HEAD`, so that we can always see what the last committed state was."
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
-#, no-wrap
+#: en/git-commit-tree.txt:47 en/git.txt:345
+#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:49
+#, priority:100
msgid "An existing tree object."
msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:50
-#, no-wrap
+#, no-wrap, priority:100
msgid "-p <parent>"
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:52
+#, priority:100
msgid "Each `-p` indicates the id of a parent commit object."
msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:53 en/git-fmt-merge-msg.txt:42
-#, no-wrap
+#, no-wrap, priority:100
msgid "-m <message>"
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:56
-msgid ""
-"A paragraph in the commit log message. This can be given more than once and "
-"each <message> becomes its own paragraph."
+#, priority:100
+msgid "A paragraph in the commit log message. This can be given more than once and each <message> becomes its own paragraph."
msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:57 en/git-commit.txt:132 en/git-fmt-merge-msg.txt:47 en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
-#, no-wrap
+#, no-wrap, priority:280
msgid "-F <file>"
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:61
-msgid ""
-"Read the commit log message from the given file. Use `-` to read from the "
-"standard input. This can be given more than once and the content of each "
-"file becomes its own paragraph."
+#, priority:100
+msgid "Read the commit log message from the given file. Use `-` to read from the standard input. This can be given more than once and the content of each file becomes its own paragraph."
msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:68 en/git-commit.txt:355
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
#. type: Plain text
#: en/git-commit-tree.txt:71
-msgid ""
-"Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier "
-"on the command line."
+#, priority:100
+msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
-#, no-wrap
+#: en/git-commit-tree.txt:73
+#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
+#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
+#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
+#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
+#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-msgid ""
-"While parent object ids are provided on the command line, author and "
-"committer information is taken from the following environment variables, if "
-"set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-msgid ""
-"In case (some of) these environment variables are not set, the information "
-"is taken from the configuration items user.name and user.email, or, if not "
-"present, the environment variable EMAIL, or, if that is not set, system user "
-"name and the hostname used for outgoing mail (taken from `/etc/mailname` and "
-"falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
-msgid ""
-"A commit comment is read from stdin. If a changelog entry is not provided "
-"via \"<\" redirection, 'git commit-tree' will just wait for one to be "
-"entered and terminated with ^D."
+#: en/git-commit-tree.txt:84
+#, priority:100
+msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
-#, no-wrap
+#: en/git-commit-tree.txt:88
+#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
-#, no-wrap
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
+#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
+#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "git-commit(1)"
msgstr "git-commit(1)"
#. type: Plain text
#: en/git-commit.txt:7
+#, priority:280
msgid "git-commit - Record changes to the repository"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:18
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
"\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n"
@@ -16408,492 +14136,415 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:27
-msgid ""
-"Create a new commit containing the current contents of the index and the "
-"given log message describing the changes. The new commit is a direct child "
-"of HEAD, usually the tip of the current branch, and the branch is updated to "
-"point to it (unless no branch is associated with the working tree, in which "
-"case HEAD is \"detached\" as described in linkgit:git-checkout[1])."
+#, priority:280
+msgid "Create a new commit containing the current contents of the index and the given log message describing the changes. The new commit is a direct child of HEAD, usually the tip of the current branch, and the branch is updated to point to it (unless no branch is associated with the working tree, in which case HEAD is \"detached\" as described in linkgit:git-checkout[1])."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:29
+#, priority:280
msgid "The content to be committed can be specified in several ways:"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:33
-msgid ""
-"by using linkgit:git-add[1] to incrementally \"add\" changes to the index "
-"before using the 'commit' command (Note: even modified files must be "
-"\"added\");"
+#, priority:280
+msgid "by using linkgit:git-add[1] to incrementally \"add\" changes to the index before using the 'commit' command (Note: even modified files must be \"added\");"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:36
-msgid ""
-"by using linkgit:git-rm[1] to remove files from the working tree and the "
-"index, again before using the 'commit' command;"
+#, priority:280
+msgid "by using linkgit:git-rm[1] to remove files from the working tree and the index, again before using the 'commit' command;"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:42
-msgid ""
-"by listing files as arguments to the 'commit' command (without --interactive "
-"or --patch switch), in which case the commit will ignore changes staged in "
-"the index, and instead record the current content of the listed files (which "
-"must already be known to Git);"
+#, priority:280
+msgid "by listing files as arguments to the 'commit' command (without --interactive or --patch switch), in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already be known to Git);"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:48
-msgid ""
-"by using the -a switch with the 'commit' command to automatically \"add\" "
-"changes from all known files (i.e. all files that are already listed in the "
-"index) and to automatically \"rm\" files in the index that have been removed "
-"from the working tree, and then perform the actual commit;"
+#, priority:280
+msgid "by using the -a switch with the 'commit' command to automatically \"add\" changes from all known files (i.e. all files that are already listed in the index) and to automatically \"rm\" files in the index that have been removed from the working tree, and then perform the actual commit;"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:54
-msgid ""
-"by using the --interactive or --patch switches with the 'commit' command to "
-"decide one by one which files or hunks should be part of the commit in "
-"addition to contents in the index, before finalizing the operation. See the "
-"``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
-"these modes."
+#, priority:280
+msgid "by using the --interactive or --patch switches with the 'commit' command to decide one by one which files or hunks should be part of the commit in addition to contents in the index, before finalizing the operation. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate these modes."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:58
-msgid ""
-"The `--dry-run` option can be used to obtain a summary of what is included "
-"by any of the above for the next commit by giving the same set of parameters "
-"(options and paths)."
+#, priority:280
+msgid "The `--dry-run` option can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters (options and paths)."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:61
-msgid ""
-"If you make a commit and then find a mistake immediately after that, you can "
-"recover from it with 'git reset'."
+#, priority:280
+msgid "If you make a commit and then find a mistake immediately after that, you can recover from it with 'git reset'."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:70
-msgid ""
-"Tell the command to automatically stage files that have been modified and "
-"deleted, but new files you have not told Git about are not affected."
+#, priority:280
+msgid "Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:76
-msgid ""
-"Use the interactive patch selection interface to chose which changes to "
-"commit. See linkgit:git-add[1] for details."
+#, priority:280
+msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:77
-#, no-wrap
+#, no-wrap, priority:280
msgid "-C <commit>"
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:78
-#, no-wrap
+#, no-wrap, priority:280
msgid "--reuse-message=<commit>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:82
-msgid ""
-"Take an existing commit object, and reuse the log message and the authorship "
-"information (including the timestamp) when creating the commit."
+#, priority:280
+msgid "Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:83
-#, no-wrap
+#, no-wrap, priority:280
msgid "-c <commit>"
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:84
-#, no-wrap
+#, no-wrap, priority:280
msgid "--reedit-message=<commit>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:87
-msgid ""
-"Like '-C', but with `-c` the editor is invoked, so that the user can further "
-"edit the commit message."
+#, priority:280
+msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the commit message."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:88
-#, no-wrap
+#, no-wrap, priority:280
msgid "--fixup=<commit>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:93
-msgid ""
-"Construct a commit message for use with `rebase --autosquash`. The commit "
-"message will be the subject line from the specified commit with a prefix of "
-"\"fixup! \". See linkgit:git-rebase[1] for details."
+#, priority:280
+msgid "Construct a commit message for use with `rebase --autosquash`. The commit message will be the subject line from the specified commit with a prefix of \"fixup! \". See linkgit:git-rebase[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:94
-#, no-wrap
+#, no-wrap, priority:280
msgid "--squash=<commit>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:100
-msgid ""
-"Construct a commit message for use with `rebase --autosquash`. The commit "
-"message subject line is taken from the specified commit with a prefix of "
-"\"squash! \". Can be used with additional commit message options "
-"(`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
+#, priority:280
+msgid "Construct a commit message for use with `rebase --autosquash`. The commit message subject line is taken from the specified commit with a prefix of \"squash! \". Can be used with additional commit message options (`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:101
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--reset-author"
msgstr "--reset-author"
#. type: Plain text
#: en/git-commit.txt:106
-msgid ""
-"When used with -C/-c/--amend options, or when committing after a conflicting "
-"cherry-pick, declare that the authorship of the resulting commit now belongs "
-"to the committer. This also renews the author timestamp."
+#, priority:280
+msgid "When used with -C/-c/--amend options, or when committing after a conflicting cherry-pick, declare that the authorship of the resulting commit now belongs to the committer. This also renews the author timestamp."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:107 en/git-status.txt:28 en/git-symbolic-ref.txt:45
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--short"
msgstr "--short"
#. type: Plain text
#: en/git-commit.txt:110
-msgid ""
-"When doing a dry-run, give the output in the short-format. See "
-"linkgit:git-status[1] for details. Implies `--dry-run`."
+#, priority:280
+msgid "When doing a dry-run, give the output in the short-format. See linkgit:git-status[1] for details. Implies `--dry-run`."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:111 en/git-status.txt:32
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--branch"
msgstr "--branch"
#. type: Plain text
#: en/git-commit.txt:113 en/git-status.txt:34
+#, priority:280
msgid "Show the branch and tracking info even in short-format."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:118
-msgid ""
-"When doing a dry-run, give the output in a porcelain-ready format. See "
-"linkgit:git-status[1] for details. Implies `--dry-run`."
+#, priority:280
+msgid "When doing a dry-run, give the output in a porcelain-ready format. See linkgit:git-status[1] for details. Implies `--dry-run`."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:119 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--long"
msgstr "--long"
#. type: Plain text
#: en/git-commit.txt:122
-msgid ""
-"When doing a dry-run, give the output in the long-format. Implies "
-"`--dry-run`."
+#, priority:280
+msgid "When doing a dry-run, give the output in the long-format. Implies `--dry-run`."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
-#, no-wrap
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
#. type: Plain text
#: en/git-commit.txt:131
-msgid ""
-"When showing `short` or `porcelain` status output, print the filename "
-"verbatim and terminate the entries with NUL, instead of LF. If no format is "
-"given, implies the `--porcelain` output format. Without the `-z` option, "
-"filenames with \"unusual\" characters are quoted as explained for the "
-"configuration variable `core.quotePath` (see linkgit:git-config[1])."
+#, priority:280
+msgid "When showing `short` or `porcelain` status output, print the filename verbatim and terminate the entries with NUL, instead of LF. If no format is given, implies the `--porcelain` output format. Without the `-z` option, filenames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:133 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
-#, no-wrap
+#, no-wrap, priority:280
msgid "--file=<file>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:136
-msgid ""
-"Take the commit message from the given file. Use '-' to read the message "
-"from the standard input."
+#, priority:280
+msgid "Take the commit message from the given file. Use '-' to read the message from the standard input."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:137
-#, no-wrap
+#, no-wrap, priority:280
msgid "--author=<author>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:143
-msgid ""
-"Override the commit author. Specify an explicit author using the standard `A "
-"U Thor <author@example.com>` format. Otherwise <author> is assumed to be a "
-"pattern and is used to search for an existing commit by that author "
-"(i.e. rev-list --all -i --author=<author>); the commit author is then copied "
-"from the first such commit found."
+#, priority:280
+msgid "Override the commit author. Specify an explicit author using the standard `A U Thor <author@example.com>` format. Otherwise <author> is assumed to be a pattern and is used to search for an existing commit by that author (i.e. rev-list --all -i --author=<author>); the commit author is then copied from the first such commit found."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:144
-#, no-wrap
+#, no-wrap, priority:280
msgid "--date=<date>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:146
+#, priority:280
msgid "Override the author date used in the commit."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:147 en/git-merge.txt:66 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162
-#, no-wrap
+#, no-wrap, priority:280
msgid "-m <msg>"
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:148 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163
-#, no-wrap
+#, no-wrap, priority:280
msgid "--message=<msg>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:152
-msgid ""
-"Use the given <msg> as the commit message. If multiple `-m` options are "
-"given, their values are concatenated as separate paragraphs."
+#, priority:280
+msgid "Use the given <msg> as the commit message. If multiple `-m` options are given, their values are concatenated as separate paragraphs."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:154
+#, priority:280
msgid "The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:155
-#, no-wrap
+#, no-wrap, priority:280
msgid "-t <file>"
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:156
-#, no-wrap
+#, no-wrap, priority:280
msgid "--template=<file>"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:165
-msgid ""
-"When editing the commit message, start the editor with the contents in the "
-"given file. The `commit.template` configuration variable is often used to "
-"give this option implicitly to the command. This mechanism can be used by "
-"projects that want to guide participants with some hints on what to write in "
-"the message in what order. If the user exits the editor without editing the "
-"message, the commit is aborted. This has no effect when a message is given "
-"by other means, e.g. with the `-m` or `-F` options."
+#, priority:280
+msgid "When editing the commit message, start the editor with the contents in the given file. The `commit.template` configuration variable is often used to give this option implicitly to the command. This mechanism can be used by projects that want to guide participants with some hints on what to write in the message in what order. If the user exits the editor without editing the message, the commit is aborted. This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:174 en/merge-options.txt:85
-msgid ""
-"Add Signed-off-by line by the committer at the end of the commit log "
-"message. The meaning of a signoff depends on the project, but it typically "
-"certifies that committer has the rights to submit this work under the same "
-"license and agrees to a Developer Certificate of Origin (see "
-"http://developercertificate.org/ for more information)."
+#, priority:280
+msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
-#, no-wrap
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
#. type: Plain text
#: en/git-commit.txt:179
-msgid ""
-"This option bypasses the pre-commit and commit-msg hooks. See also "
-"linkgit:githooks[5]."
+#, priority:280
+msgid "This option bypasses the pre-commit and commit-msg hooks. See also linkgit:githooks[5]."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:185
-msgid ""
-"Usually recording a commit that has the exact same tree as its sole parent "
-"commit is a mistake, and the command prevents you from making such a "
-"commit. This option bypasses the safety, and is primarily for use by "
-"foreign SCM interface scripts."
+#, priority:280
+msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:191
-msgid ""
-"Like --allow-empty this command is primarily for use by foreign SCM "
-"interface scripts. It allows you to create a commit with an empty commit "
-"message without using plumbing commands like linkgit:git-commit-tree[1]."
+#, priority:280
+msgid "Like --allow-empty this command is primarily for use by foreign SCM interface scripts. It allows you to create a commit with an empty commit message without using plumbing commands like linkgit:git-commit-tree[1]."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:196
-msgid ""
-"This option determines how the supplied commit message should be cleaned up "
-"before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, "
-"`scissors` or `default`."
+#, priority:280
+msgid "This option determines how the supplied commit message should be cleaned up before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, `scissors` or `default`."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:198
-#, no-wrap
+#, no-wrap, priority:280
msgid "strip"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:201
-msgid ""
-"Strip leading and trailing empty lines, trailing whitespace, commentary and "
-"collapse consecutive empty lines."
+#, priority:280
+msgid "Strip leading and trailing empty lines, trailing whitespace, commentary and collapse consecutive empty lines."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:201
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:280
msgid "whitespace"
msgstr "--whitespace"
#. type: Plain text
#: en/git-commit.txt:203
+#, priority:280
msgid "Same as `strip` except #commentary is not removed."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:203
-#, no-wrap
+#, no-wrap, priority:280
msgid "verbatim"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:205
+#, priority:280
msgid "Do not change the message at all."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:205
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:280
msgid "scissors"
msgstr "--scissors"
#. type: Plain text
#: en/git-commit.txt:209
-msgid ""
-"Same as `whitespace` except that everything from (and including) the line "
-"found below is truncated, if the message is to be edited. \"`#`\" can be "
-"customized with core.commentChar."
+#, priority:280
+msgid "Same as `whitespace` except that everything from (and including) the line found below is truncated, if the message is to be edited. \"`#`\" can be customized with core.commentChar."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:211
-#, no-wrap
+#, no-wrap, priority:280
msgid "# ------------------------ >8 ------------------------\n"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:215
+#, priority:280
msgid "Same as `strip` if the message is to be edited. Otherwise `whitespace`."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:219
-msgid ""
-"The default can be changed by the `commit.cleanup` configuration variable "
-"(see linkgit:git-config[1])."
+#, priority:280
+msgid "The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:226
-msgid ""
-"The message taken from file with `-F`, command line with `-m`, and from "
-"commit object with `-C` are usually used as the commit log message "
-"unmodified. This option lets you further edit the message taken from these "
-"sources."
+#, priority:280
+msgid "The message taken from file with `-F`, command line with `-m`, and from commit object with `-C` are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:227 en/git-revert.txt:66 en/merge-options.txt:17
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-edit"
msgstr "--no-edit"
#. type: Plain text
#: en/git-commit.txt:231
-msgid ""
-"Use the selected commit message without launching an editor. For example, "
-"`git commit --amend --no-edit` amends a commit without changing its commit "
-"message."
+#, priority:280
+msgid "Use the selected commit message without launching an editor. For example, `git commit --amend --no-edit` amends a commit without changing its commit message."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:232
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--amend"
msgstr "--amend"
#. type: Plain text
#: en/git-commit.txt:242
-msgid ""
-"Replace the tip of the current branch by creating a new commit. The recorded "
-"tree is prepared as usual (including the effect of the `-i` and `-o` options "
-"and explicit pathspec), and the message from the original commit is used as "
-"the starting point, instead of an empty message, when no other message is "
-"specified from the command line via options such as `-m`, `-F`, `-c`, etc. "
-"The new commit has the same parents and author as the current one (the "
-"`--reset-author` option can countermand this)."
+#, priority:280
+msgid "Replace the tip of the current branch by creating a new commit. The recorded tree is prepared as usual (including the effect of the `-i` and `-o` options and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as `-m`, `-F`, `-c`, etc. The new commit has the same parents and author as the current one (the `--reset-author` option can countermand this)."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:245
+#, priority:280
msgid "It is a rough equivalent for:"
msgstr ""
#. type: delimited block -
#: en/git-commit.txt:249
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"\t$ git reset --soft HEAD^\n"
"\t$ ... do something else to come up with the right tree ...\n"
@@ -16902,216 +14553,175 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:252
+#, priority:280
msgid "but can be used to amend a merge commit."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:257
-msgid ""
-"You should understand the implications of rewriting history if you amend a "
-"commit that has already been published. (See the \"RECOVERING FROM UPSTREAM "
-"REBASE\" section in linkgit:git-rebase[1].)"
+#, priority:280
+msgid "You should understand the implications of rewriting history if you amend a commit that has already been published. (See the \"RECOVERING FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)"
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:258
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
#. type: Plain text
#: en/git-commit.txt:260
-#, fuzzy
+#, fuzzy, priority:280
msgid "Bypass the post-rewrite hook."
msgstr "gancho bypass post reescritura"
#. type: Labeled list
#: en/git-commit.txt:262
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--include"
msgstr "--include"
#. type: Plain text
#: en/git-commit.txt:267
-msgid ""
-"Before making a commit out of staged contents so far, stage the contents of "
-"paths given on the command line as well. This is usually not what you want "
-"unless you are concluding a conflicted merge."
+#, priority:280
+msgid "Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:269
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--only"
msgstr "--only"
#. type: Plain text
#: en/git-commit.txt:281
-msgid ""
-"Make a commit by taking the updated working tree contents of the paths "
-"specified on the command line, disregarding any contents that have been "
-"staged for other paths. This is the default mode of operation of 'git "
-"commit' if any paths are given on the command line, in which case this "
-"option can be omitted. If this option is specified together with `--amend`, "
-"then no paths need to be specified, which can be used to amend the last "
-"commit without committing changes that have already been staged. If used "
-"together with `--allow-empty` paths are also not required, and an empty "
-"commit will be created."
+#, priority:280
+msgid "Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:295 en/git-status.txt:58
-#, no-wrap
+#, no-wrap, priority:280
msgid "-u[<mode>]"
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:296 en/git-status.txt:59
-#, no-wrap
+#, no-wrap, priority:280
msgid "--untracked-files[=<mode>]"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:298 en/git-status.txt:61
-#, fuzzy
+#, fuzzy, priority:280
msgid "Show untracked files."
msgstr "No hay archivos sin rastrear.\n"
#. type: Plain text
#: en/git-commit.txt:303
-msgid ""
-"The mode parameter is optional (defaults to 'all'), and is used to specify "
-"the handling of untracked files; when -u is not used, the default is "
-"'normal', i.e. show untracked files and directories."
+#, priority:280
+msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:305 en/git-status.txt:68 en/git-status.txt:110
+#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:307
-#, no-wrap
+#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:308
-#, no-wrap
+#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:309 en/git-status.txt:72
-#, no-wrap
+#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:312 en/git-status.txt:85
-msgid ""
-"The default can be changed using the status.showUntrackedFiles configuration "
-"variable documented in linkgit:git-config[1]."
+#, priority:280
+msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:324
-msgid ""
-"Show unified diff between the HEAD commit and what would be committed at the "
-"bottom of the commit message template to help the user describe the commit "
-"by reminding what changes the commit has. Note that this diff output "
-"doesn't have its lines prefixed with '#'. This diff will not be a part of "
-"the commit message. See the `commit.verbose` configuration variable in "
-"linkgit:git-config[1]."
+#, priority:280
+msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:328
-msgid ""
-"If specified twice, show in addition the unified diff between what would be "
-"committed and the worktree files, i.e. the unstaged changes to tracked "
-"files."
+#, priority:280
+msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:332
+#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:337
-msgid ""
-"Do not create a commit, but show a list of paths that are to be committed, "
-"paths with local changes that will be left uncommitted and paths that are "
-"untracked."
+#, priority:280
+msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:338
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
#: en/git-commit.txt:343
-msgid ""
-"Include the output of linkgit:git-status[1] in the commit message template "
-"when using an editor to prepare the commit message. Defaults to on, but can "
-"be used to override configuration variable commit.status."
+#, priority:280
+msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:344
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
#: en/git-commit.txt:348
-msgid ""
-"Do not include the output of linkgit:git-status[1] in the commit message "
-"template when using an editor to prepare the default commit message."
+#, priority:280
+msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:358
-msgid ""
-"Countermand `commit.gpgSign` configuration variable that is set to force "
-"each and every commit to be signed."
+#, priority:280
+msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:367
-msgid ""
-"When pathspec is given on the command line, commit the contents of the files "
-"that match the pathspec without recording the changes already added to the "
-"index. The contents of these files are also staged for the next commit on "
-"top of what have been staged before."
+#, priority:280
+msgid "When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
-msgid ""
-"When recording your own work, the contents of modified files in your working "
-"tree are temporarily stored to a staging area called the \"index\" with 'git "
-"add'. A file can be reverted back, only in the index but not in the working "
-"tree, to that of the last commit with `git restore --staged <file>`, which "
-"effectively reverts 'git add' and prevents the changes to this file from "
-"participating in the next commit. After building the state to be committed "
-"incrementally with these commands, `git commit` (without any pathname "
-"parameter) is used to record what has been staged so far. This is the most "
-"basic form of the command. An example:"
+#: en/git-commit.txt:383
+#, priority:280
+msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
-#, no-wrap
+#: en/git-commit.txt:389
+#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
"$ git rm goodbye.c\n"
@@ -17120,18 +14730,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
-msgid ""
-"Instead of staging files after each individual change, you can tell `git "
-"commit` to notice the changes to the files whose contents are tracked in "
-"your working tree and do corresponding `git add` and `git rm` for you. That "
-"is, this example does the same as the earlier example if there is no other "
-"change in your working tree:"
+#: en/git-commit.txt:397
+#, priority:280
+msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
-#, no-wrap
+#: en/git-commit.txt:402
+#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
"$ rm goodbye.c\n"
@@ -17139,25 +14745,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
-msgid ""
-"The command `git commit -a` first looks at your working tree, notices that "
-"you have modified hello.c and removed goodbye.c, and performs necessary `git "
-"add` and `git rm` for you."
+#: en/git-commit.txt:407
+#, priority:280
+msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
-msgid ""
-"After staging changes to many files, you can alter the order the changes are "
-"recorded in, by giving pathnames to `git commit`. When pathnames are given, "
-"the command makes a commit that only records the changes made to the named "
-"paths:"
+#: en/git-commit.txt:412
+#, priority:280
+msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
-#, no-wrap
+#: en/git-commit.txt:418
+#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
"$ git add hello.c hello.h\n"
@@ -17166,41 +14767,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
-msgid ""
-"This makes a commit that records the modification to `Makefile`. The "
-"changes staged for `hello.c` and `hello.h` are not included in the resulting "
-"commit. However, their changes are not lost -- they are still staged and "
-"merely held back. After the above sequence, if you do:"
+#: en/git-commit.txt:425
+#, priority:280
+msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
-#, no-wrap
+#: en/git-commit.txt:428 en/git-commit.txt:454
+#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
-msgid ""
-"this second commit would record the changes to `hello.c` and `hello.h` as "
-"expected."
+#: en/git-commit.txt:432
+#, priority:280
+msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
-msgid ""
-"After a merge (initiated by 'git merge' or 'git pull') stops because of "
-"conflicts, cleanly merged paths are already staged to be committed for you, "
-"and paths that conflicted are left in unmerged state. You would have to "
-"first check which paths are conflicting with 'git status' and after fixing "
-"them manually in your working tree, you would stage the result as usual with "
-"'git add':"
+#: en/git-commit.txt:440
+#, priority:280
+msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
-#, no-wrap
+#: en/git-commit.txt:446
+#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
"unmerged: hello.c\n"
@@ -17209,120 +14801,141 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
-msgid ""
-"After resolving conflicts and staging the result, `git ls-files -u` would "
-"stop mentioning the conflicted path. When you are done, run `git commit` to "
-"finally record the merge:"
+#: en/git-commit.txt:451
+#, priority:280
+msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
+#, priority:280
+msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
+msgstr ""
+
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
msgid ""
-"As with the case to record your own changes, you can use `-a` option to save "
-"typing. One difference is that during a merge resolution, you cannot use "
-"`git commit` with pathnames to alter the order the changes are committed, "
-"because the merge should be recorded as a single commit. In fact, the "
-"command refuses to run when given pathnames (but see `-i` option)."
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:477
-msgid ""
-"Though not required, it's a good idea to begin the commit message with a "
-"single short (less than 50 character) line summarizing the change, followed "
-"by a blank line and then a more thorough description. The text up to the "
-"first blank line in a commit message is treated as the commit title, and "
-"that title is used throughout Git. For example, linkgit:git-format-patch[1] "
-"turns a commit into email, and it uses the title on the Subject line and the "
-"rest of the commit in the body."
+#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
+msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
-#, no-wrap
+#: en/git-commit.txt:515
+#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
-msgid ""
-"The editor used to edit the commit log message will be chosen from the "
-"`GIT_EDITOR` environment variable, the core.editor configuration variable, "
-"the `VISUAL` environment variable, or the `EDITOR` environment variable (in "
-"that order). See linkgit:git-var[1] for details."
+#: en/git-commit.txt:520
+#, priority:280
+msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
-msgid ""
-"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
-"`post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
-"information."
+#: en/git-commit.txt:526
+#, priority:280
+msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
-#, no-wrap
+#: en/git-commit.txt:530
+#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
-msgid ""
-"This file contains the commit message of a commit in progress. If `git "
-"commit` exits due to an error before creating a commit, any commit message "
-"that has been provided by the user (e.g., in an editor session) will be "
-"available in this file, but will be overwritten by the next invocation of "
-"`git commit`."
+#: en/git-commit.txt:536
+#, priority:280
+msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
-msgid ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], "
-"linkgit:git-merge[1], linkgit:git-commit-tree[1]"
-msgstr ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[1]"
+msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Title =
#: en/git-config.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-config(1)"
msgstr "git-config(1)"
#. type: Plain text
#: en/git-config.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-config - Get and set repository or global options"
msgstr "Configurar repositorio u opciones globales"
#. type: Plain text
#: en/git-config.txt:27
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] "
-"name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
-"'git config' [<file-option>] [--type=<type>] --replace-all name value "
-"[value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] "
-"--get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] "
-"--get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] "
-"[--name-only] --get-regexp name_regex [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name "
-"URL\n"
+"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | "
-"--list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -17330,737 +14943,649 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:33
-msgid ""
-"You can query/set/replace/unset options with this command. The name is "
-"actually the section and the key separated by a dot, and the value will be "
-"escaped."
+#, priority:100
+msgid "You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped."
msgstr ""
#. type: Plain text
#: en/git-config.txt:40
-msgid ""
-"Multiple lines can be added to an option by using the `--add` option. If "
-"you want to update or unset an option which can occur on multiple lines, a "
-"POSIX regexp `value_regex` needs to be given. Only the existing values that "
-"match the regexp are updated or unset. If you want to handle the lines that "
-"do *not* match the regex, just prepend a single exclamation mark in front "
-"(see also <<EXAMPLES>>)."
+#, priority:100
+msgid "Multiple lines can be added to an option by using the `--add` option. If you want to update or unset an option which can occur on multiple lines, a POSIX regexp `value_regex` needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do *not* match the regex, just prepend a single exclamation mark in front (see also <<EXAMPLES>>)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:45
-msgid ""
-"The `--type=<type>` option instructs 'git config' to ensure that incoming "
-"and outgoing values are canonicalize-able under the given <type>. If no "
-"`--type=<type>` is given, no canonicalization will be performed. Callers may "
-"unset an existing `--type` specifier with `--no-type`."
+#, priority:100
+msgid "The `--type=<type>` option instructs 'git config' to ensure that incoming and outgoing values are canonicalize-able under the given <type>. If no `--type=<type>` is given, no canonicalization will be performed. Callers may unset an existing `--type` specifier with `--no-type`."
msgstr ""
#. type: Plain text
#: en/git-config.txt:51
-msgid ""
-"When reading, the values are read from the system, global and repository "
-"local configuration files by default, and options `--system`, `--global`, "
-"`--local`, `--worktree` and `--file <filename>` can be used to tell the "
-"command to read from only that location (see <<FILES>>)."
+#, priority:100
+msgid "When reading, the values are read from the system, global and repository local configuration files by default, and options `--system`, `--global`, `--local`, `--worktree` and `--file <filename>` can be used to tell the command to read from only that location (see <<FILES>>)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:57
-msgid ""
-"When writing, the new value is written to the repository local configuration "
-"file by default, and options `--system`, `--global`, `--worktree`, `--file "
-"<filename>` can be used to tell the command to write to that location (you "
-"can say `--local` but that is the default)."
+#, priority:100
+msgid "When writing, the new value is written to the repository local configuration file by default, and options `--system`, `--global`, `--worktree`, `--file <filename>` can be used to tell the command to write to that location (you can say `--local` but that is the default)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:60
-msgid ""
-"This command will fail with non-zero status upon error. Some exit codes "
-"are:"
+#, priority:100
+msgid "This command will fail with non-zero status upon error. Some exit codes are:"
msgstr ""
#. type: Plain text
#: en/git-config.txt:62
+#, priority:100
msgid "The section or key is invalid (ret=1),"
msgstr ""
#. type: Plain text
#: en/git-config.txt:63
+#, priority:100
msgid "no section or name was provided (ret=2),"
msgstr ""
#. type: Plain text
#: en/git-config.txt:64
+#, priority:100
msgid "the config file is invalid (ret=3),"
msgstr ""
#. type: Plain text
#: en/git-config.txt:65
+#, priority:100
msgid "the config file cannot be written (ret=4),"
msgstr ""
#. type: Plain text
#: en/git-config.txt:66
+#, priority:100
msgid "you try to unset an option which does not exist (ret=5),"
msgstr ""
#. type: Plain text
#: en/git-config.txt:67
+#, priority:100
msgid "you try to unset/set an option for which multiple lines match (ret=5), or"
msgstr ""
#. type: Plain text
#: en/git-config.txt:68
+#, priority:100
msgid "you try to use an invalid regexp (ret=6)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:70
+#, priority:100
msgid "On success, the command returns the exit code 0."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--replace-all"
msgstr "--replace-all"
#. type: Plain text
#: en/git-config.txt:77
-msgid ""
-"Default behavior is to replace at most one line. This replaces all lines "
-"matching the key (and optionally the value_regex)."
+#, priority:100
+msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex)."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:45
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--add"
msgstr "--add"
#. type: Plain text
#: en/git-config.txt:82
-msgid ""
-"Adds a new line to the option without altering any existing values. This is "
-"the same as providing '^$' as the value_regex in `--replace-all`."
+#, priority:100
+msgid "Adds a new line to the option without altering any existing values. This is the same as providing '^$' as the value_regex in `--replace-all`."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--get"
msgstr "--get"
#. type: Plain text
#: en/git-config.txt:87
-msgid ""
-"Get the value for a given key (optionally filtered by a regex matching the "
-"value). Returns error code 1 if the key was not found and the last value if "
-"multiple key values were found."
+#, priority:100
+msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--get-all"
msgstr "--get-all"
#. type: Plain text
#: en/git-config.txt:90
+#, priority:100
msgid "Like get, but returns all values for a multi-valued key."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--get-regexp"
msgstr "--get-regexp"
#. type: Plain text
#: en/git-config.txt:97
-msgid ""
-"Like --get-all, but interprets the name as a regular expression and writes "
-"out the key names. Regular expression matching is currently case-sensitive "
-"and done against a canonicalized version of the key in which section and "
-"variable names are lowercased, but subsection names are not."
+#, priority:100
+msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names. Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:98
-#, no-wrap
+#, no-wrap, priority:100
msgid "--get-urlmatch name URL"
msgstr ""
#. type: Plain text
#: en/git-config.txt:105
-msgid ""
-"When given a two-part name section.key, the value for section.<url>.key "
-"whose <url> part matches the best to the given URL is returned (if no such "
-"key exists, the value for section.key is used as a fallback). When given "
-"just the section as name, do so for all the keys in the section and list "
-"them. Returns error code 1 if no value is found."
+#, priority:100
+msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback). When given just the section as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:106
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--global"
msgstr "--global"
#. type: Plain text
#: en/git-config.txt:111
-msgid ""
-"For writing options: write to global `~/.gitconfig` file rather than the "
-"repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if "
-"this file exists and the `~/.gitconfig` file doesn't."
+#, priority:100
+msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
msgstr ""
#. type: Plain text
#: en/git-config.txt:114
-msgid ""
-"For reading options: read only from global `~/.gitconfig` and from "
-"`$XDG_CONFIG_HOME/git/config` rather than from all available files."
+#, priority:100
+msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
+#, priority:100
msgid "See also <<FILES>>."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:117
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--system"
msgstr "--system"
#. type: Plain text
#: en/git-config.txt:121
-msgid ""
-"For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather "
-"than the repository `.git/config`."
+#, priority:100
+msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
msgstr ""
#. type: Plain text
#: en/git-config.txt:124
-msgid ""
-"For reading options: read only from system-wide `$(prefix)/etc/gitconfig` "
-"rather than from all available files."
+#, priority:100
+msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
msgstr ""
#. type: Plain text
#: en/git-config.txt:130
-msgid ""
-"For writing options: write to the repository `.git/config` file. This is "
-"the default behavior."
+#, priority:100
+msgid "For writing options: write to the repository `.git/config` file. This is the default behavior."
msgstr ""
#. type: Plain text
#: en/git-config.txt:133
-msgid ""
-"For reading options: read only from the repository `.git/config` rather than "
-"from all available files."
+#, priority:100
+msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:136 en/git-restore.txt:58
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--worktree"
msgstr "--worktree"
#. type: Plain text
#: en/git-config.txt:140
-msgid ""
-"Similar to `--local` except that `.git/config.worktree` is read from or "
-"written to if `extensions.worktreeConfig` is present. If not it's the same "
-"as `--local`."
+#, priority:100
+msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:141
-#, no-wrap
+#, no-wrap, priority:100
msgid "-f config-file"
msgstr ""
#. type: Labeled list
#: en/git-config.txt:142
-#, no-wrap
+#, no-wrap, priority:100
msgid "--file config-file"
msgstr ""
#. type: Plain text
#: en/git-config.txt:144
+#, priority:100
msgid "Use the given config file instead of the one specified by GIT_CONFIG."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:145
-#, no-wrap
+#, no-wrap, priority:100
msgid "--blob blob"
msgstr ""
#. type: Plain text
#: en/git-config.txt:151
-msgid ""
-"Similar to `--file` but use the given blob instead of a file. E.g. you can "
-"use 'master:.gitmodules' to read values from the file '.gitmodules' in the "
-"master branch. See \"SPECIFYING REVISIONS\" section in "
-"linkgit:gitrevisions[7] for a more complete list of ways to spell blob "
-"names."
+#, priority:100
+msgid "Similar to `--file` but use the given blob instead of a file. E.g. you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:152
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--remove-section"
msgstr "--remove-section"
#. type: Plain text
#: en/git-config.txt:154
+#, priority:100
msgid "Remove the given section from the configuration file."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:155
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--rename-section"
msgstr "--rename-section"
#. type: Plain text
#: en/git-config.txt:157
+#, priority:100
msgid "Rename the given section to a new name."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:158
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unset"
msgstr "--unset"
#. type: Plain text
#: en/git-config.txt:160
+#, priority:100
msgid "Remove the line matching the key from config file."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:161
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unset-all"
msgstr "--unset-all"
#. type: Plain text
#: en/git-config.txt:163
+#, priority:100
msgid "Remove all lines matching the key from config file."
msgstr ""
#. type: Plain text
#: en/git-config.txt:167
+#, priority:100
msgid "List all variables set in config file, along with their values."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:168
-#, no-wrap
+#, no-wrap, priority:100
msgid "--type <type>"
msgstr ""
#. type: Plain text
#: en/git-config.txt:172
-msgid ""
-"'git config' will ensure that any input or output is valid under the given "
-"type constraint(s), and will canonicalize outgoing values in `<type>`'s "
-"canonical form."
+#, priority:100
+msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
msgstr ""
#. type: Plain text
#: en/git-config.txt:174
+#, priority:100
msgid "Valid `<type>`'s include:"
msgstr ""
#. type: Plain text
#: en/git-config.txt:176
+#, priority:100
msgid "'bool': canonicalize values as either \"true\" or \"false\"."
msgstr ""
#. type: Plain text
#: en/git-config.txt:179
-msgid ""
-"'int': canonicalize values as simple decimal numbers. An optional suffix of "
-"'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or "
-"1073741824 upon input."
+#, priority:100
+msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
msgstr ""
#. type: Plain text
#: en/git-config.txt:181
-msgid ""
-"'bool-or-int': canonicalize according to either 'bool' or 'int', as "
-"described above."
+#, priority:100
+msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
msgstr ""
#. type: Plain text
#: en/git-config.txt:185
-msgid ""
-"'path': canonicalize by adding a leading `~` to the value of `$HOME` and "
-"`~user` to the home directory for the specified user. This specifier has no "
-"effect when setting the value (but you can use `git config section.variable "
-"~/` from the command line to let your shell do the expansion.)"
+#, priority:100
+msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
msgstr ""
#. type: Plain text
#: en/git-config.txt:187
-msgid ""
-"'expiry-date': canonicalize by converting from a fixed or relative "
-"date-string to a timestamp. This specifier has no effect when setting the "
-"value."
+#, priority:100
+msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
msgstr ""
#. type: Plain text
#: en/git-config.txt:191
-msgid ""
-"'color': When getting a value, canonicalize by converting to an ANSI color "
-"escape sequence. When setting a value, a sanity-check is performed to ensure "
-"that the given value is canonicalize-able as an ANSI color, but it is "
-"written as-is."
+#, priority:100
+msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:193
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--bool"
msgstr "--bool"
#. type: Labeled list
#: en/git-config.txt:194
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--int"
msgstr "--int"
#. type: Labeled list
#: en/git-config.txt:195
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--bool-or-int"
msgstr "--bool-or-int"
#. type: Labeled list
#: en/git-config.txt:196 en/git-hash-object.txt:39
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--path"
msgstr "--path"
#. type: Labeled list
#: en/git-config.txt:197
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--expiry-date"
msgstr "--expiry-date"
#. type: Plain text
#: en/git-config.txt:200
-msgid ""
-"Historical options for selecting a type specifier. Prefer instead `--type` "
-"(see above)."
+#, priority:100
+msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:201
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-type"
msgstr "--no-type"
#. type: Plain text
#: en/git-config.txt:205
-msgid ""
-"Un-sets the previously set type specifier (if one was previously set). This "
-"option requests that 'git config' not canonicalize the retrieved variable. "
-"`--no-type` has no effect without `--type=<type>` or `--<type>`."
+#, priority:100
+msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable. `--no-type` has no effect without `--type=<type>` or `--<type>`."
msgstr ""
#. type: Plain text
#: en/git-config.txt:214
-msgid ""
-"For all options that output values and/or keys, always end values with the "
-"null character (instead of a newline). Use newline instead as a delimiter "
-"between key and value. This allows for secure parsing of the output without "
-"getting confused e.g. by values that contain line breaks."
+#, priority:100
+msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
msgstr ""
#. type: Plain text
#: en/git-config.txt:218
+#, priority:100
msgid "Output only the names of config variables for `--list` or `--get-regexp`."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:219
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-origin"
msgstr "--show-origin"
#. type: Plain text
#: en/git-config.txt:224
-msgid ""
-"Augment the output of all queried config options with the origin type (file, "
-"standard input, blob, command line) and the actual origin (config file path, "
-"ref, or blob id if applicable)."
+#, priority:100
+msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
-#, no-wrap
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
+#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
-msgid ""
-"Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or "
-"\"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is "
-"taken into account when configuration says \"auto\". If `stdout-is-tty` is "
-"missing, then checks the standard output of the command itself, and exits "
-"with status 0 if color is to be used, or exits with status 1 otherwise. "
-"When the color setting for `name` is undefined, the command uses `color.ui` "
-"as fallback."
+#: en/git-config.txt:240
+#, priority:100
+msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
-#, no-wrap
+#: en/git-config.txt:241
+#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
-msgid ""
-"Find the color configured for `name` (e.g. `color.diff.new`) and output it "
-"as the ANSI color escape sequence to the standard output. The optional "
-"`default` parameter is used instead, if there is no color configured for "
-"`name`."
+#: en/git-config.txt:247
+#, priority:100
+msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
-msgid ""
-"`--type=color [--default=<default>]` is preferred over `--get-color` (but "
-"note that `--get-color` will omit the trailing newline printed by "
-"`--type=color`)."
+#: en/git-config.txt:251
+#, priority:100
+msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
-msgid ""
-"Opens an editor to modify the specified config file; either `--system`, "
-"`--global`, or repository (default)."
+#: en/git-config.txt:256
+#, priority:100
+msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
-#, no-wrap
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
-msgid ""
-"Respect `include.*` directives in config files when looking up "
-"values. Defaults to `off` when a specific file is given (e.g., using "
-"`--file`, `--global`, etc) and `on` when searching all config files."
+#: en/git-config.txt:262
+#, priority:100
+msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
-#, no-wrap
+#: en/git-config.txt:263
+#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
-msgid ""
-"When using `--get`, and the requested variable is not found, behave as if "
-"<value> were the value assigned to the that variable."
+#: en/git-config.txt:266
+#, priority:100
+msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
-msgid ""
-"`pager.config` is only respected when listing configuration, i.e., when "
-"using `--list` or any of the `--get-*` which may return multiple results. "
-"The default is to use a pager."
+#: en/git-config.txt:272
+#, priority:100
+msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
-msgid ""
-"If not set explicitly with `--file`, there are four files where 'git config' "
-"will search for configuration options:"
+#: en/git-config.txt:279
+#, priority:100
+msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
-#, no-wrap
+#: en/git-config.txt:280
+#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
+#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
-#, no-wrap
+#: en/git-config.txt:283
+#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
-msgid ""
-"Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or "
-"empty, `$HOME/.config/git/config` will be used. Any single-valued variable "
-"set in this file will be overwritten by whatever is in `~/.gitconfig`. It "
-"is a good idea not to create this file if you sometimes use older versions "
-"of Git, as support for this file was added fairly recently."
+#: en/git-config.txt:290
+#, priority:100
+msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
-#, no-wrap
+#: en/git-config.txt:291
+#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
+#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
-#, no-wrap
+#: en/git-config.txt:295
+#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
+#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
-#, no-wrap
+#: en/git-config.txt:298
+#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
-msgid ""
-"This is optional and is only searched when `extensions.worktreeConfig` is "
-"present in $GIT_DIR/config."
+#: en/git-config.txt:301
+#, priority:100
+msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
-msgid ""
-"If no further options are given, all reading options will read all of these "
-"files that are available. If the global or the system-wide configuration "
-"file are not available they will be ignored. If the repository configuration "
-"file is not available or readable, 'git config' will exit with a non-zero "
-"error code. However, in neither case will an error message be issued."
+#: en/git-config.txt:307
+#, priority:100
+msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
-msgid ""
-"The files are read in the order given above, with last value found taking "
-"precedence over values read earlier. When multiple values are taken then "
-"all values of a key from all files will be used."
+#: en/git-config.txt:311
+#, priority:100
+msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
-msgid ""
-"You may override individual configuration parameters when running any git "
-"command by using the `-c` option. See linkgit:git[1] for details."
+#: en/git-config.txt:314
+#, priority:100
+msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
-msgid ""
-"All writing options will per default write to the repository specific "
-"configuration file. Note that this also affects options like `--replace-all` "
-"and `--unset`. *'git config' will only ever change one file at a time*."
+#: en/git-config.txt:318
+#, priority:100
+msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
-msgid ""
-"You can override these rules either by command-line options or by "
-"environment variables. The `--global`, `--system` and `--worktree` options "
-"will limit the file used to the global, system-wide or per-worktree file "
-"respectively. The `GIT_CONFIG` environment variable has a similar effect, "
-"but you can specify any filename you want."
+#: en/git-config.txt:324
+#, priority:100
+msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
-#, no-wrap
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
-msgid ""
-"Take the configuration from the given file instead of .git/config. Using "
-"the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" "
-"option forces this to $(prefix)/etc/gitconfig."
+#: en/git-config.txt:333
+#, priority:100
+msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
-#, no-wrap
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
-msgid ""
-"Whether to skip reading settings from the system-wide "
-"$(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
+#: en/git-config.txt:337
+#, priority:100
+msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
+#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
-#, no-wrap
+#: en/git-config.txt:353
+#, no-wrap, priority:100
msgid ""
"#\n"
"# This is the config file, and\n"
@@ -18070,8 +15595,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
-#, no-wrap
+#: en/git-config.txt:358 en/git.txt:324
+#, no-wrap, priority:100
msgid ""
"; core variables\n"
"[core]\n"
@@ -18080,8 +15605,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
-#, no-wrap
+#: en/git-config.txt:363
+#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
"[diff]\n"
@@ -18090,8 +15615,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
-#, no-wrap
+#: en/git-config.txt:368
+#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
"[core]\n"
@@ -18100,8 +15625,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
-#, no-wrap
+#: en/git-config.txt:375
+#, no-wrap, priority:100
msgid ""
"; HTTP\n"
"[http]\n"
@@ -18112,153 +15637,158 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
+#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
-#, no-wrap
+#: en/git-config.txt:381
+#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
-msgid ""
-"The hypothetical proxy command entries actually have a postfix to discern "
-"what URL they apply to. Here is how to change the entry for kernel.org to "
-"\"ssh\"."
+#: en/git-config.txt:386
+#, priority:100
+msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
-#, no-wrap
+#: en/git-config.txt:389
+#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
+#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
+#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
-#, no-wrap
+#: en/git-config.txt:397
+#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
-msgid ""
-"If you want to delete an entry for a multivar (like core.gitproxy above), "
-"you have to provide a regex matching the value of exactly one line."
+#: en/git-config.txt:401
+#, priority:100
+msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
+#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
-#, no-wrap
+#: en/git-config.txt:406
+#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
+#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
-#, no-wrap
+#: en/git-config.txt:412
+#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
+#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
-#, no-wrap
+#: en/git-config.txt:418
+#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
+#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
-#, no-wrap
+#: en/git-config.txt:424
+#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
-msgid ""
-"If you like to live dangerously, you can replace *all* core.gitproxy by a "
-"new one with"
+#: en/git-config.txt:428
+#, priority:100
+msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
-#, no-wrap
+#: en/git-config.txt:431
+#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
-msgid ""
-"However, if you really only want to replace the line for the default proxy, "
-"i.e. the one without a \"for ...\" postfix, do something like this:"
+#: en/git-config.txt:435
+#, ignore-ellipsis, priority:100
+msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
-#, no-wrap
+#: en/git-config.txt:438
+#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
+#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
-#, no-wrap
+#: en/git-config.txt:444
+#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
+#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
-#, no-wrap
+#: en/git-config.txt:450
+#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
+#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
-#, no-wrap
+#: en/git-config.txt:460
+#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
"WS=$(git config --get-color color.diff.whitespace \"blue reverse\")\n"
@@ -18267,21 +15797,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
-msgid ""
-"For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, "
-"while it is set to `true` for all others:"
+#: en/git-config.txt:464
+#, priority:100
+msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
-#, no-wrap
+#: en/git-config.txt:473
+#, no-wrap, priority:100
msgid ""
-"% git config --type=bool --get-urlmatch http.sslverify "
-"https://good.example.com\n"
+"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
"true\n"
-"% git config --type=bool --get-urlmatch http.sslverify "
-"https://weak.example.com\n"
+"% git config --type=bool --get-urlmatch http.sslverify https://weak.example.com\n"
"false\n"
"% git config --get-urlmatch http https://weak.example.com\n"
"http.cookieFile /tmp/cookie.txt\n"
@@ -18289,36 +15816,34 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
-#, no-wrap
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
-msgid ""
-"When using the deprecated `[section.subsection]` syntax, changing a value "
-"will result in adding a multi-line key instead of a change, if the "
-"subsection is given with at least one uppercase character. For example when "
-"the config looks like"
+#: en/git-config.txt:483
+#, priority:100
+msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
-#, no-wrap
+#: en/git-config.txt:487
+#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
" key = value1\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
+#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
-#, no-wrap
+#: en/git-config.txt:495
+#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
" key = value1\n"
@@ -18327,239 +15852,217 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-count-objects(1)"
msgstr "git-count-objects(1)"
#. type: Plain text
#: en/git-count-objects.txt:7
-msgid ""
-"git-count-objects - Count unpacked number of objects and their disk "
-"consumption"
+#, priority:100
+msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:12
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'git count-objects' [-v] [-H | --human-readable]\n"
msgstr "git count-objects [-v] [-H | --human-readable]"
#. type: Plain text
#: en/git-count-objects.txt:17
-msgid ""
-"This counts the number of unpacked object files and disk space consumed by "
-"them, to help you decide when it is a good time to repack."
+#, priority:100
+msgid "This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack."
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:24
+#, priority:100
msgid "Report in more detail:"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:26
+#, priority:100
msgid "count: the number of loose objects"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:28
+#, priority:100
msgid "size: disk space consumed by loose objects, in KiB (unless -H is specified)"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:30
+#, priority:100
msgid "in-pack: the number of in-pack objects"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:32
+#, priority:100
msgid "size-pack: disk space consumed by the packs, in KiB (unless -H is specified)"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:35
-msgid ""
-"prune-packable: the number of loose objects that are also present in the "
-"packs. These objects could be pruned using `git prune-packed`."
+#, priority:100
+msgid "prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using `git prune-packed`."
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:38
-msgid ""
-"garbage: the number of files in object database that are neither valid loose "
-"objects nor valid packs"
+#, priority:100
+msgid "garbage: the number of files in object database that are neither valid loose objects nor valid packs"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:41
-msgid ""
-"size-garbage: disk space consumed by garbage files, in KiB (unless -H is "
-"specified)"
+#, priority:100
+msgid "size-garbage: disk space consumed by garbage files, in KiB (unless -H is specified)"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:46
-msgid ""
-"alternate: absolute path of alternate object databases; may appear multiple "
-"times, one line per path. Note that if the path contains non-printable "
-"characters, it may be surrounded by double-quotes and contain C-style "
-"backslashed escape sequences."
+#, priority:100
+msgid "alternate: absolute path of alternate object databases; may appear multiple times, one line per path. Note that if the path contains non-printable characters, it may be surrounded by double-quotes and contain C-style backslashed escape sequences."
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
-#, no-wrap
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
+#, no-wrap, priority:100
msgid "-H"
msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--human-readable"
msgstr "--human-readable"
#. type: Plain text
#: en/git-count-objects.txt:51
-#, fuzzy
+#, fuzzy, priority:100
msgid "Print sizes in human readable format"
msgstr "mostrar tama챰os en formato legible para humano"
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-credential-cache--daemon(1)"
msgstr "git-credential-cache--daemon(1)"
#. type: Plain text
#: en/git-credential-cache--daemon.txt:7
+#, priority:100
msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
msgstr ""
#. type: Plain text
#: en/git-credential-cache--daemon.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "git credential-cache--daemon [--debug] <socket>\n"
msgstr ""
#. type: Plain text
#: en/git-credential-cache--daemon.txt:18
-msgid ""
-"You probably don't want to invoke this command yourself; it is started "
-"automatically when you use linkgit:git-credential-cache[1]."
+#, priority:100
+msgid "You probably don't want to invoke this command yourself; it is started automatically when you use linkgit:git-credential-cache[1]."
msgstr ""
#. type: Plain text
#: en/git-credential-cache--daemon.txt:23
-msgid ""
-"This command listens on the Unix domain socket specified by `<socket>` for "
-"`git-credential-cache` clients. Clients may store and retrieve "
-"credentials. Each credential is held for a timeout specified by the client; "
-"once no credentials are held, the daemon exits."
+#, priority:100
+msgid "This command listens on the Unix domain socket specified by `<socket>` for `git-credential-cache` clients. Clients may store and retrieve credentials. Each credential is held for a timeout specified by the client; once no credentials are held, the daemon exits."
msgstr ""
#. type: Plain text
#: en/git-credential-cache--daemon.txt:27
-msgid ""
-"If the `--debug` option is specified, the daemon does not close its stderr "
-"stream, and may output extra diagnostics to it even after it has begun "
-"listening for clients."
+#, priority:100
+msgid "If the `--debug` option is specified, the daemon does not close its stderr stream, and may output extra diagnostics to it even after it has begun listening for clients."
msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-credential-cache(1)"
msgstr "git-credential-cache(1)"
#. type: Plain text
#: en/git-credential-cache.txt:7
+#, priority:100
msgid "git-credential-cache - Helper to temporarily store passwords in memory"
msgstr ""
#. type: delimited block -
#: en/git-credential-cache.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "git config credential.helper 'cache [<options>]'\n"
msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:21
-msgid ""
-"This command caches credentials in memory for use by future Git "
-"programs. The stored credentials never touch the disk, and are forgotten "
-"after a configurable timeout. The cache is accessible over a Unix domain "
-"socket, restricted to the current user by filesystem permissions."
+#, priority:100
+msgid "This command caches credentials in memory for use by future Git programs. The stored credentials never touch the disk, and are forgotten after a configurable timeout. The cache is accessible over a Unix domain socket, restricted to the current user by filesystem permissions."
msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:25
-msgid ""
-"You probably don't want to invoke this command directly; it is meant to be "
-"used as a credential helper by other parts of Git. See "
-"linkgit:gitcredentials[7] or `EXAMPLES` below."
+#, priority:100
+msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of Git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
#: en/git-credential-cache.txt:29
-#, no-wrap
+#, no-wrap, priority:100
msgid "--timeout <seconds>"
msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:32
+#, priority:100
msgid "Number of seconds to cache credentials (default: 900)."
msgstr ""
#. type: Labeled list
#: en/git-credential-cache.txt:33
-#, no-wrap
+#, no-wrap, priority:100
msgid "--socket <path>"
msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:43
-msgid ""
-"Use `<path>` to contact a running cache daemon (or start a new cache daemon "
-"if one is not started). Defaults to `$XDG_CACHE_HOME/git/credential/socket` "
-"unless `~/.git-credential-cache/` exists in which case "
-"`~/.git-credential-cache/socket` is used instead. If your home directory is "
-"on a network-mounted filesystem, you may need to change this to a local "
-"filesystem. You must specify an absolute path."
+#, priority:100
+msgid "Use `<path>` to contact a running cache daemon (or start a new cache daemon if one is not started). Defaults to `$XDG_CACHE_HOME/git/credential/socket` unless `~/.git-credential-cache/` exists in which case `~/.git-credential-cache/socket` is used instead. If your home directory is on a network-mounted filesystem, you may need to change this to a local filesystem. You must specify an absolute path."
msgstr ""
#. type: Title -
#: en/git-credential-cache.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "CONTROLLING THE DAEMON"
msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:49
-msgid ""
-"If you would like the daemon to exit early, forgetting all cached "
-"credentials before their timeout, you can issue an `exit` action:"
+#, priority:100
+msgid "If you would like the daemon to exit early, forgetting all cached credentials before their timeout, you can issue an `exit` action:"
msgstr ""
#. type: delimited block -
#: en/git-credential-cache.txt:52
-#, no-wrap
+#, no-wrap, priority:100
msgid "git credential-cache exit\n"
msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:59 en/git-credential-store.txt:75
-msgid ""
-"The point of this helper is to reduce the number of times you must type your "
-"username or password. For example:"
+#, priority:100
+msgid "The point of this helper is to reduce the number of times you must type your username or password. For example:"
msgstr ""
#. type: delimited block -
#: en/git-credential-cache.txt:65
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git config credential.helper cache\n"
"$ git push http://example.com/repo.git\n"
@@ -18569,7 +16072,7 @@ msgstr ""
#. type: delimited block -
#: en/git-credential-cache.txt:69
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[work for 5 more minutes]\n"
"$ git push http://example.com/repo.git\n"
@@ -18578,137 +16081,115 @@ msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:73
-msgid ""
-"You can provide options via the credential.helper configuration variable "
-"(this example drops the cache time to 5 minutes):"
+#, priority:100
+msgid "You can provide options via the credential.helper configuration variable (this example drops the cache time to 5 minutes):"
msgstr ""
#. type: delimited block -
#: en/git-credential-cache.txt:76
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git config credential.helper 'cache --timeout=300'\n"
msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-credential-store(1)"
msgstr "git-credential-store(1)"
#. type: Plain text
#: en/git-credential-store.txt:7
+#, priority:100
msgid "git-credential-store - Helper to store credentials on disk"
msgstr ""
#. type: delimited block -
#: en/git-credential-store.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "git config credential.helper 'store [<options>]'\n"
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:21
-msgid ""
-"Using this helper will store your passwords unencrypted on disk, protected "
-"only by filesystem permissions. If this is not an acceptable security "
-"tradeoff, try linkgit:git-credential-cache[1], or find a helper that "
-"integrates with secure storage provided by your operating system."
+#, priority:100
+msgid "Using this helper will store your passwords unencrypted on disk, protected only by filesystem permissions. If this is not an acceptable security tradeoff, try linkgit:git-credential-cache[1], or find a helper that integrates with secure storage provided by your operating system."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:24
-msgid ""
-"This command stores credentials indefinitely on disk for use by future Git "
-"programs."
+#, priority:100
+msgid "This command stores credentials indefinitely on disk for use by future Git programs."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:28
-msgid ""
-"You probably don't want to invoke this command directly; it is meant to be "
-"used as a credential helper by other parts of git. See "
-"linkgit:gitcredentials[7] or `EXAMPLES` below."
+#, priority:100
+msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
#: en/git-credential-store.txt:32
-#, no-wrap
+#, no-wrap, priority:100
msgid "--file=<path>"
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:42
-msgid ""
-"Use `<path>` to lookup and store credentials. The file will have its "
-"filesystem permissions set to prevent other users on the system from reading "
-"it, but will not be encrypted or otherwise protected. If not specified, "
-"credentials will be searched for from `~/.git-credentials` and "
-"`$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to "
-"`~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if "
-"it exists and the former does not. See also <<FILES>>."
+#, priority:100
+msgid "Use `<path>` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system from reading it, but will not be encrypted or otherwise protected. If not specified, credentials will be searched for from `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it exists and the former does not. See also <<FILES>>."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:49
-msgid ""
-"If not set explicitly with `--file`, there are two files where "
-"git-credential-store will search for credentials in order of precedence:"
+#, priority:100
+msgid "If not set explicitly with `--file`, there are two files where git-credential-store will search for credentials in order of precedence:"
msgstr ""
#. type: Labeled list
#: en/git-credential-store.txt:50
-#, no-wrap
+#, no-wrap, priority:100
msgid "~/.git-credentials"
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:52
+#, priority:100
msgid "User-specific credentials file."
msgstr ""
#. type: Labeled list
#: en/git-credential-store.txt:53
-#, no-wrap
+#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/credentials"
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:59
-msgid ""
-"Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set or "
-"empty, `$HOME/.config/git/credentials` will be used. Any credentials stored "
-"in this file will not be used if `~/.git-credentials` has a matching "
-"credential as well. It is a good idea not to create this file if you "
-"sometimes use older versions of Git that do not support it."
+#, priority:100
+msgid "Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set or empty, `$HOME/.config/git/credentials` will be used. Any credentials stored in this file will not be used if `~/.git-credentials` has a matching credential as well. It is a good idea not to create this file if you sometimes use older versions of Git that do not support it."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:63
-msgid ""
-"For credential lookups, the files are read in the order given above, with "
-"the first matching credential found taking precedence over credentials found "
-"in files further down the list."
+#, priority:100
+msgid "For credential lookups, the files are read in the order given above, with the first matching credential found taking precedence over credentials found in files further down the list."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:67
-msgid ""
-"Credential storage will by default write to the first existing file in the "
-"list. If none of these files exist, `~/.git-credentials` will be created and "
-"written to."
+#, priority:100
+msgid "Credential storage will by default write to the first existing file in the list. If none of these files exist, `~/.git-credentials` will be created and written to."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:69
-msgid ""
-"When erasing credentials, matching credentials will be erased from all "
-"files."
+#, priority:100
+msgid "When erasing credentials, matching credentials will be erased from all files."
msgstr ""
#. type: delimited block -
#: en/git-credential-store.txt:81
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git config credential.helper store\n"
"$ git push http://example.com/repo.git\n"
@@ -18718,7 +16199,7 @@ msgstr ""
#. type: delimited block -
#: en/git-credential-store.txt:85
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[several days later]\n"
"$ git push http://example.com/repo.git\n"
@@ -18727,130 +16208,109 @@ msgstr ""
#. type: Title -
#: en/git-credential-store.txt:88
-#, no-wrap
+#, no-wrap, priority:100
msgid "STORAGE FORMAT"
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:92
-msgid ""
-"The `.git-credentials` file is stored in plaintext. Each credential is "
-"stored on its own line as a URL like:"
+#, priority:100
+msgid "The `.git-credentials` file is stored in plaintext. Each credential is stored on its own line as a URL like:"
msgstr ""
#. type: delimited block -
#: en/git-credential-store.txt:95
-#, no-wrap
+#, no-wrap, priority:100
msgid "https://user:pass@example.com\n"
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:103
-msgid ""
-"When Git needs authentication for a particular URL context, credential-store "
-"will consider that context a pattern to match against each entry in the "
-"credentials file. If the protocol, hostname, and username (if we already "
-"have one) match, then the password is returned to Git. See the discussion of "
-"configuration in linkgit:gitcredentials[7] for more information."
+#, priority:100
+msgid "When Git needs authentication for a particular URL context, credential-store will consider that context a pattern to match against each entry in the credentials file. If the protocol, hostname, and username (if we already have one) match, then the password is returned to Git. See the discussion of configuration in linkgit:gitcredentials[7] for more information."
msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-credential(1)"
msgstr "git-credential(1)"
#. type: Plain text
#: en/git-credential.txt:7
+#, priority:100
msgid "git-credential - Retrieve and store user credentials"
msgstr ""
#. type: delimited block -
#: en/git-credential.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "git credential <fill|approve|reject>\n"
msgstr ""
#. type: Plain text
#: en/git-credential.txt:24
-msgid ""
-"Git has an internal interface for storing and retrieving credentials from "
-"system-specific helpers, as well as prompting the user for usernames and "
-"passwords. The git-credential command exposes this interface to scripts "
-"which may want to retrieve, store, or prompt for credentials in the same "
-"manner as Git. The design of this scriptable interface models the internal C "
-"API; see credential.h for more background on the concepts."
+#, priority:100
+msgid "Git has an internal interface for storing and retrieving credentials from system-specific helpers, as well as prompting the user for usernames and passwords. The git-credential command exposes this interface to scripts which may want to retrieve, store, or prompt for credentials in the same manner as Git. The design of this scriptable interface models the internal C API; see credential.h for more background on the concepts."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:28
-msgid ""
-"git-credential takes an \"action\" option on the command-line (one of "
-"`fill`, `approve`, or `reject`) and reads a credential description on stdin "
-"(see <<IOFMT,INPUT/OUTPUT FORMAT>>)."
+#, priority:100
+msgid "git-credential takes an \"action\" option on the command-line (one of `fill`, `approve`, or `reject`) and reads a credential description on stdin (see <<IOFMT,INPUT/OUTPUT FORMAT>>)."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:35
-msgid ""
-"If the action is `fill`, git-credential will attempt to add \"username\" and "
-"\"password\" attributes to the description by reading config files, by "
-"contacting any configured credential helpers, or by prompting the user. The "
-"username and password attributes of the credential description are then "
-"printed to stdout together with the attributes already provided."
+#, priority:100
+msgid "If the action is `fill`, git-credential will attempt to add \"username\" and \"password\" attributes to the description by reading config files, by contacting any configured credential helpers, or by prompting the user. The username and password attributes of the credential description are then printed to stdout together with the attributes already provided."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:39
-msgid ""
-"If the action is `approve`, git-credential will send the description to any "
-"configured credential helpers, which may store the credential for later use."
+#, priority:100
+msgid "If the action is `approve`, git-credential will send the description to any configured credential helpers, which may store the credential for later use."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:43
-msgid ""
-"If the action is `reject`, git-credential will send the description to any "
-"configured credential helpers, which may erase any stored credential "
-"matching the description."
+#, priority:100
+msgid "If the action is `reject`, git-credential will send the description to any configured credential helpers, which may erase any stored credential matching the description."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:45
+#, priority:100
msgid "If the action is `approve` or `reject`, no output should be emitted."
msgstr ""
#. type: Title -
#: en/git-credential.txt:47
-#, no-wrap
+#, no-wrap, priority:100
msgid "TYPICAL USE OF GIT CREDENTIAL"
msgstr ""
#. type: Plain text
#: en/git-credential.txt:51
-msgid ""
-"An application using git-credential will typically use `git credential` "
-"following these steps:"
+#, priority:100
+msgid "An application using git-credential will typically use `git credential` following these steps:"
msgstr ""
#. type: Plain text
#: en/git-credential.txt:53
+#, priority:100
msgid "Generate a credential description based on the context."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:59
-msgid ""
-"For example, if we want a password for `https://example.com/foo.git`, we "
-"might generate the following credential description (don't forget the blank "
-"line at the end; it tells `git credential` that the application finished "
-"feeding all the information it has):"
+#, priority:100
+msgid "For example, if we want a password for `https://example.com/foo.git`, we might generate the following credential description (don't forget the blank line at the end; it tells `git credential` that the application finished feeding all the information it has):"
msgstr ""
#. type: Plain text
#: en/git-credential.txt:63
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t protocol=https\n"
"\t host=example.com\n"
@@ -18859,17 +16319,13 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:69
-msgid ""
-"Ask git-credential to give us a username and password for this "
-"description. This is done by running `git credential fill`, feeding the "
-"description from step (1) to its standard input. The complete credential "
-"description (including the credential per se, i.e. the login and password) "
-"will be produced on standard output, like:"
+#, priority:100
+msgid "Ask git-credential to give us a username and password for this description. This is done by running `git credential fill`, feeding the description from step (1) to its standard input. The complete credential description (including the credential per se, i.e. the login and password) will be produced on standard output, like:"
msgstr ""
#. type: Plain text
#: en/git-credential.txt:74
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"protocol=https\n"
"host=example.com\n"
@@ -18879,170 +16335,133 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:79
-msgid ""
-"In most cases, this means the attributes given in the input will be repeated "
-"in the output, but Git may also modify the credential description, for "
-"example by removing the `path` attribute when the protocol is HTTP(s) and "
-"`credential.useHttpPath` is false."
+#, priority:100
+msgid "In most cases, this means the attributes given in the input will be repeated in the output, but Git may also modify the credential description, for example by removing the `path` attribute when the protocol is HTTP(s) and `credential.useHttpPath` is false."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:85
-msgid ""
-"If the `git credential` knew about the password, this step may not have "
-"involved the user actually typing this password (the user may have typed a "
-"password to unlock the keychain instead, or no user interaction was done if "
-"the keychain was already unlocked) before it returned `password=secr3t`."
+#, priority:100
+msgid "If the `git credential` knew about the password, this step may not have involved the user actually typing this password (the user may have typed a password to unlock the keychain instead, or no user interaction was done if the keychain was already unlocked) before it returned `password=secr3t`."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:88
-msgid ""
-"Use the credential (e.g., access the URL with the username and password from "
-"step (2)), and see if it's accepted."
+#, priority:100
+msgid "Use the credential (e.g., access the URL with the username and password from step (2)), and see if it's accepted."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:98
-msgid ""
-"Report on the success or failure of the password. If the credential allowed "
-"the operation to complete successfully, then it can be marked with an "
-"\"approve\" action to tell `git credential` to reuse it in its next "
-"invocation. If the credential was rejected during the operation, use the "
-"\"reject\" action so that `git credential` will ask for a new password in "
-"its next invocation. In either case, `git credential` should be fed with the "
-"credential description obtained from step (2) (which also contain the ones "
-"provided in step (1))."
+#, priority:100
+msgid "Report on the success or failure of the password. If the credential allowed the operation to complete successfully, then it can be marked with an \"approve\" action to tell `git credential` to reuse it in its next invocation. If the credential was rejected during the operation, use the \"reject\" action so that `git credential` will ask for a new password in its next invocation. In either case, `git credential` should be fed with the credential description obtained from step (2) (which also contain the ones provided in step (1))."
msgstr ""
#. type: Title -
#: en/git-credential.txt:101
-#, no-wrap
+#, no-wrap, priority:100
msgid "INPUT/OUTPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-credential.txt:108
-msgid ""
-"`git credential` reads and/or writes (depending on the action used) "
-"credential information in its standard input/output. This information can "
-"correspond either to keys for which `git credential` will obtain the "
-"login/password information (e.g. host, protocol, path), or to the actual "
-"credential data to be obtained (login/password)."
+#, priority:100
+msgid "`git credential` reads and/or writes (depending on the action used) credential information in its standard input/output. This information can correspond either to keys for which `git credential` will obtain the login/password information (e.g. host, protocol, path), or to the actual credential data to be obtained (login/password)."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:118
-msgid ""
-"The credential is split into a set of named attributes, with one attribute "
-"per line. Each attribute is specified by a key-value pair, separated by an "
-"`=` (equals) sign, followed by a newline. The key may contain any bytes "
-"except `=`, newline, or NUL. The value may contain any bytes except newline "
-"or NUL. In both cases, all bytes are treated as-is (i.e., there is no "
-"quoting, and one cannot transmit a value with newline or NUL in it). The "
-"list of attributes is terminated by a blank line or end-of-file. Git "
-"understands the following attributes:"
+#, priority:100
+msgid "The credential is split into a set of named attributes, with one attribute per line. Each attribute is specified by a key-value pair, separated by an `=` (equals) sign, followed by a newline. The key may contain any bytes except `=`, newline, or NUL. The value may contain any bytes except newline or NUL. In both cases, all bytes are treated as-is (i.e., there is no quoting, and one cannot transmit a value with newline or NUL in it). The list of attributes is terminated by a blank line or end-of-file. Git understands the following attributes:"
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:119
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`protocol`"
msgstr "`protocol`"
#. type: Plain text
#: en/git-credential.txt:123
+#, priority:100
msgid "The protocol over which the credential will be used (e.g., `https`)."
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:124
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`host`"
msgstr "`host`"
#. type: Plain text
#: en/git-credential.txt:127
+#, priority:100
msgid "The remote hostname for a network credential."
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:128
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`path`"
msgstr "`path`"
#. type: Plain text
#: en/git-credential.txt:133
-msgid ""
-"The path with which the credential will be used. E.g., for accessing a "
-"remote https repository, this will be the repository's path on the server."
+#, priority:100
+msgid "The path with which the credential will be used. E.g., for accessing a remote https repository, this will be the repository's path on the server."
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:134
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`username`"
msgstr "`username`"
#. type: Plain text
#: en/git-credential.txt:138
-msgid ""
-"The credential's username, if we already have one (e.g., from a URL, from "
-"the user, or from a previously run helper)."
+#, priority:100
+msgid "The credential's username, if we already have one (e.g., from a URL, from the user, or from a previously run helper)."
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:139
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`password`"
msgstr "`password`"
#. type: Plain text
#: en/git-credential.txt:142
+#, priority:100
msgid "The credential's password, if we are asking it to be stored."
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:143
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`url`"
msgstr "`url`"
#. type: Plain text
#: en/git-credential.txt:153
-msgid ""
-"When this special attribute is read by `git credential`, the value is parsed "
-"as a URL and treated as if its constituent parts were read (e.g., "
-"`url=https://example.com` would behave as if `protocol=https` and "
-"`host=example.com` had been provided). This can help callers avoid parsing "
-"URLs themselves. Note that any components which are missing from the URL "
-"(e.g., there is no username in the example above) will be set to empty; if "
-"you want to provide a URL and override some attributes, provide the URL "
-"attribute first, followed by any overrides."
+#, priority:100
+msgid "When this special attribute is read by `git credential`, the value is parsed as a URL and treated as if its constituent parts were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). This can help callers avoid parsing URLs themselves. Note that any components which are missing from the URL (e.g., there is no username in the example above) will be set to empty; if you want to provide a URL and override some attributes, provide the URL attribute first, followed by any overrides."
msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-cvsexportcommit(1)"
msgstr "git-cvsexportcommit(1)"
#. type: Plain text
#: en/git-cvsexportcommit.txt:7
+#, priority:100
msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]\n"
"\t[-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID\n"
@@ -19050,138 +16469,127 @@ msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:20
-msgid ""
-"Exports a commit from Git to a CVS checkout, making it easier to merge "
-"patches from a Git repository into a CVS repository."
+#, priority:100
+msgid "Exports a commit from Git to a CVS checkout, making it easier to merge patches from a Git repository into a CVS repository."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:24
-msgid ""
-"Specify the name of a CVS checkout using the -w switch or execute it from "
-"the root of the CVS working copy. In the latter case GIT_DIR must be "
-"defined. See examples below."
+#, priority:100
+msgid "Specify the name of a CVS checkout using the -w switch or execute it from the root of the CVS working copy. In the latter case GIT_DIR must be defined. See examples below."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:28
-msgid ""
-"It does its best to do the safe thing, it will check that the files are "
-"unchanged and up to date in the CVS checkout, and it will not autocommit by "
-"default."
+#, priority:100
+msgid "It does its best to do the safe thing, it will check that the files are unchanged and up to date in the CVS checkout, and it will not autocommit by default."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:30
+#, priority:100
msgid "Supports file additions, removals, and commits that affect binary files."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:33
-msgid ""
-"If the commit is a merge commit, you must tell 'git cvsexportcommit' what "
-"parent the changeset should be done against."
+#, priority:100
+msgid "If the commit is a merge commit, you must tell 'git cvsexportcommit' what parent the changeset should be done against."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:40
-msgid ""
-"Commit automatically if the patch applied cleanly. It will not commit if any "
-"hunks fail to apply or there were other problems."
+#, priority:100
+msgid "Commit automatically if the patch applied cleanly. It will not commit if any hunks fail to apply or there were other problems."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:44
+#, priority:100
msgid "Be pedantic (paranoid) when applying patches. Invokes patch with --fuzz=0"
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:48
-msgid ""
-"Add authorship information. Adds Author line, and Committer (if different "
-"from Author) to the message."
+#, priority:100
+msgid "Add authorship information. Adds Author line, and Committer (if different from Author) to the message."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:53
-msgid ""
-"Set an alternative CVSROOT to use. This corresponds to the CVS -d "
-"parameter. Usually users will not want to set this, except if using CVS in "
-"an asymmetric fashion."
+#, priority:100
+msgid "Set an alternative CVSROOT to use. This corresponds to the CVS -d parameter. Usually users will not want to set this, except if using CVS in an asymmetric fashion."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:56
+#, priority:100
msgid "Force the merge even if the files are not up to date."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:59
+#, priority:100
msgid "Force the parent commit, even if it is not a direct parent."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:63
-msgid ""
-"Prepend the commit message with the provided prefix. Useful for patch "
-"series and the like."
+#, priority:100
+msgid "Prepend the commit message with the provided prefix. Useful for patch series and the like."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:66
+#, priority:100
msgid "Update affected files from CVS repository before attempting export."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:70
-msgid ""
-"Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ becomes $Revision$) "
-"in working CVS checkout before applying patch."
+#, priority:100
+msgid "Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ becomes $Revision$) in working CVS checkout before applying patch."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:76
-msgid ""
-"Specify the location of the CVS checkout to use for the export. This option "
-"does not require GIT_DIR to be set before execution if the current directory "
-"is within a Git repository. The default is the value of "
-"'cvsexportcommit.cvsdir'."
+#, priority:100
+msgid "Specify the location of the CVS checkout to use for the export. This option does not require GIT_DIR to be set before execution if the current directory is within a Git repository. The default is the value of 'cvsexportcommit.cvsdir'."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:81
-msgid ""
-"Tell cvsexportcommit that the current working directory is not only a Git "
-"checkout, but also the CVS checkout. Therefore, Git will reset the working "
-"directory to the parent commit before proceeding."
+#, priority:100
+msgid "Tell cvsexportcommit that the current working directory is not only a Git checkout, but also the CVS checkout. Therefore, Git will reset the working directory to the parent commit before proceeding."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:84
-#, fuzzy
+#, fuzzy, priority:100
msgid "Verbose."
msgstr "verboso"
#. type: Labeled list
#: en/git-cvsexportcommit.txt:87
-#, no-wrap
+#, no-wrap, priority:100
msgid "cvsexportcommit.cvsdir"
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:89
+#, priority:100
msgid "The default location of the CVS checkout to use for the export."
msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:93
-#, no-wrap
+#, no-wrap, priority:100
msgid "Merge one patch into CVS"
msgstr ""
#. type: delimited block -
#: en/git-cvsexportcommit.txt:100
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ export GIT_DIR=~/project/.git\n"
"$ cd ~/project_cvs_checkout\n"
@@ -19191,52 +16599,46 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:102
-#, no-wrap
-msgid ""
-"Merge one patch into CVS (-c and -w options). The working directory is "
-"within the Git Repo"
+#, no-wrap, priority:100
+msgid "Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo"
msgstr ""
#. type: delimited block -
#: en/git-cvsexportcommit.txt:106
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t$ git cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1>\n"
msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:108
-#, no-wrap
-msgid ""
-"Merge pending patches into CVS automatically -- only if you really know what "
-"you are doing"
+#, no-wrap, priority:100
+msgid "Merge pending patches into CVS automatically -- only if you really know what you are doing"
msgstr ""
#. type: delimited block -
#: en/git-cvsexportcommit.txt:114
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ export GIT_DIR=~/project/.git\n"
"$ cd ~/project_cvs_checkout\n"
-"$ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git "
-"cvsexportcommit -c -p -v\n"
+"$ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v\n"
msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-cvsimport(1)"
msgstr "git-cvsimport(1)"
#. type: Plain text
#: en/git-cvsimport.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
msgstr "Salva tus datos de otro SCM que la gente adora odiar"
#. type: Plain text
#: en/git-cvsimport.txt:17
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]\n"
"\t [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]\n"
@@ -19247,7 +16649,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:26
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"*WARNING:* `git cvsimport` uses cvsps version 2, which is considered\n"
"deprecated; it does not work with cvsps version 3 and later. If you are\n"
@@ -19258,21 +16660,19 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:29
-msgid ""
-"Imports a CVS repository into Git. It will either create a new repository, "
-"or incrementally import into an existing one."
+#, priority:100
+msgid "Imports a CVS repository into Git. It will either create a new repository, or incrementally import into an existing one."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:32
-msgid ""
-"Splitting the CVS log into patch sets is done by 'cvsps'. At least version "
-"2.1 is required."
+#, priority:100
+msgid "Splitting the CVS log into patch sets is done by 'cvsps'. At least version 2.1 is required."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"*WARNING:* for certain situations the import leads to incorrect results.\n"
"Please see the section <<issues,ISSUES>> for further reference.\n"
@@ -19280,268 +16680,241 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:42
-msgid ""
-"You should *never* do any work of your own on the branches that are created "
-"by 'git cvsimport'. By default initial import will create and populate a "
-"\"master\" branch from the CVS repository's main branch which you're free to "
-"work with; after that, you need to 'git merge' incremental imports, or any "
-"CVS branches, yourself. It is advisable to specify a named remote via -r to "
-"separate and protect the incoming branches."
+#, priority:100
+msgid "You should *never* do any work of your own on the branches that are created by 'git cvsimport'. By default initial import will create and populate a \"master\" branch from the CVS repository's main branch which you're free to work with; after that, you need to 'git merge' incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via -r to separate and protect the incoming branches."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:48
-msgid ""
-"If you intend to set up a shared public repository that all developers can "
-"read/write, or if you want to use linkgit:git-cvsserver[1], then you "
-"probably want to make a bare clone of the imported repository, and use the "
-"clone as the shared repository. See linkgit:gitcvs-migration[7]."
+#, priority:100
+msgid "If you intend to set up a shared public repository that all developers can read/write, or if you want to use linkgit:git-cvsserver[1], then you probably want to make a bare clone of the imported repository, and use the clone as the shared repository. See linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:54
+#, priority:100
msgid "Verbosity: let 'cvsimport' report what it is doing."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:55
-#, no-wrap
+#, no-wrap, priority:100
msgid "-d <CVSROOT>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:61
-msgid ""
-"The root of the CVS archive. May be local (a simple path) or remote; "
-"currently, only the :local:, :ext: and :pserver: access methods are "
-"supported. If not given, 'git cvsimport' will try to read it from "
-"`CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment "
-"variable."
+#, priority:100
+msgid "The root of the CVS archive. May be local (a simple path) or remote; currently, only the :local:, :ext: and :pserver: access methods are supported. If not given, 'git cvsimport' will try to read it from `CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:62
-#, no-wrap
+#, no-wrap, priority:100
msgid "<CVS_module>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:66
-msgid ""
-"The CVS module you want to import. Relative to <CVSROOT>. If not given, "
-"'git cvsimport' tries to read it from `CVS/Repository`."
+#, priority:100
+msgid "The CVS module you want to import. Relative to <CVSROOT>. If not given, 'git cvsimport' tries to read it from `CVS/Repository`."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:67
-#, no-wrap
+#, no-wrap, priority:100
msgid "-C <target-dir>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:69
+#, priority:100
msgid "The Git repository to import to. If the directory doesn't"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
+#, no-wrap, priority:100
msgid "exist, it will be created. Default is the current directory.\n"
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:71
-#, no-wrap
+#, no-wrap, priority:100
msgid "-r <remote>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:75
-msgid ""
-"The Git remote to import this CVS repository into. Moves all CVS branches "
-"into remotes/<remote>/<branch> akin to the way 'git clone' uses 'origin' by "
-"default."
+#, priority:100
+msgid "The Git remote to import this CVS repository into. Moves all CVS branches into remotes/<remote>/<branch> akin to the way 'git clone' uses 'origin' by default."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:76
-#, no-wrap
+#, no-wrap, priority:100
msgid "-o <branch-for-HEAD>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:84
-msgid ""
-"When no remote is specified (via -r) the `HEAD` branch from CVS is imported "
-"to the 'origin' branch within the Git repository, as `HEAD` already has a "
-"special meaning for Git. When a remote is specified the `HEAD` branch is "
-"named remotes/<remote>/master mirroring 'git clone' behaviour. Use this "
-"option if you want to import into a different branch."
+#, priority:100
+msgid "When no remote is specified (via -r) the `HEAD` branch from CVS is imported to the 'origin' branch within the Git repository, as `HEAD` already has a special meaning for Git. When a remote is specified the `HEAD` branch is named remotes/<remote>/master mirroring 'git clone' behaviour. Use this option if you want to import into a different branch."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:87
-msgid ""
-"Use '-o master' for continuing an import that was initially done by the old "
-"cvs2git tool."
+#, priority:100
+msgid "Use '-o master' for continuing an import that was initially done by the old cvs2git tool."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:92
-msgid ""
-"Import-only: don't perform a checkout after importing. This option ensures "
-"the working directory and index remain untouched and will not create them if "
-"they do not exist."
+#, priority:100
+msgid "Import-only: don't perform a checkout after importing. This option ensures the working directory and index remain untouched and will not create them if they do not exist."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:97
-msgid ""
-"Kill keywords: will extract files with '-kk' from the CVS archive to avoid "
-"noisy changesets. Highly recommended, but off by default to preserve "
-"compatibility with early imported trees."
+#, priority:100
+msgid "Kill keywords: will extract files with '-kk' from the CVS archive to avoid noisy changesets. Highly recommended, but off by default to preserve compatibility with early imported trees."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:100
+#, priority:100
msgid "Convert underscores in tag and branch names to dots."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:101
-#, no-wrap
+#, no-wrap, priority:100
msgid "-s <subst>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:103
+#, priority:100
msgid "Substitute the character \"/\" in branch names with <subst>"
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:104
-#, no-wrap
+#, no-wrap, priority:100
msgid "-p <options-for-cvsps>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:107
-msgid ""
-"Additional options for cvsps. The options `-u` and '-A' are implicit and "
-"should not be used here."
+#, priority:100
+msgid "Additional options for cvsps. The options `-u` and '-A' are implicit and should not be used here."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:109
+#, priority:100
msgid "If you need to pass multiple options, separate them with a comma."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:110
-#, no-wrap
+#, no-wrap, priority:100
msgid "-z <fuzz>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:113
-msgid ""
-"Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps "
-"defaults to 300s."
+#, priority:100
+msgid "Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps defaults to 300s."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:114
-#, no-wrap
+#, no-wrap, priority:100
msgid "-P <cvsps-output-file>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:117
-msgid ""
-"Instead of calling cvsps, read the provided cvsps output file. Useful for "
-"debugging or when cvsps is being handled outside cvsimport."
+#, priority:100
+msgid "Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:122
-msgid ""
-"Attempt to detect merges based on the commit message. This option will "
-"enable default regexes that try to capture the source branch name from the "
-"commit message."
+#, priority:100
+msgid "Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the source branch name from the commit message."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:123
-#, no-wrap
+#, no-wrap, priority:100
msgid "-M <regex>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:127
-msgid ""
-"Attempt to detect merges based on the commit message with a custom regex. It "
-"can be used with `-m` to enable the default regexes as well. You must escape "
-"forward slashes."
+#, priority:100
+msgid "Attempt to detect merges based on the commit message with a custom regex. It can be used with `-m` to enable the default regexes as well. You must escape forward slashes."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:129
+#, priority:100
msgid "The regex must capture the source branch name in $1."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:131
+#, priority:100
msgid "This option can be used several times to provide several detection regexes."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:132
-#, no-wrap
+#, no-wrap, priority:100
msgid "-S <regex>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:134
+#, priority:100
msgid "Skip paths matching the regex."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:138
-msgid ""
-"Import all commits, including recent ones. cvsimport by default skips "
-"commits that have a timestamp less than 10 minutes ago."
+#, priority:100
+msgid "Import all commits, including recent ones. cvsimport by default skips commits that have a timestamp less than 10 minutes ago."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:139
-#, no-wrap
+#, no-wrap, priority:100
msgid "-L <limit>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:142
-msgid ""
-"Limit the number of commits imported. Workaround for cases where cvsimport "
-"leaks memory."
+#, priority:100
+msgid "Limit the number of commits imported. Workaround for cases where cvsimport leaks memory."
msgstr ""
#. type: Labeled list
#: en/git-cvsimport.txt:143
-#, no-wrap
+#, no-wrap, priority:100
msgid "-A <author-conv-file>"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:148
-msgid ""
-"CVS by default uses the Unix username when writing its commit logs. Using "
-"this option and an author-conv-file maps the name recorded in CVS to author "
-"name, e-mail and optional time zone:"
+#, priority:100
+msgid "CVS by default uses the Unix username when writing its commit logs. Using this option and an author-conv-file maps the name recorded in CVS to author name, e-mail and optional time zone:"
msgstr ""
#. type: delimited block -
#: en/git-cvsimport.txt:152
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\texon=Andreas Ericsson <ae@op5.se>\n"
"\tspawn=Simon Pawn <spawn@frog-pond.org> America/Chicago\n"
@@ -19549,172 +16922,163 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:159
-msgid ""
-"'git cvsimport' will make it appear as those authors had their "
-"GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone "
-"is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
+#, priority:100
+msgid "'git cvsimport' will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:163
-msgid ""
-"For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the "
-"'-A' option is provided and read from that same file each time 'git "
-"cvsimport' is run."
+#, priority:100
+msgid "For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the '-A' option is provided and read from that same file each time 'git cvsimport' is run."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:167
-msgid ""
-"It is not recommended to use this feature if you intend to export changes "
-"back to CVS again later with 'git cvsexportcommit'."
+#, priority:100
+msgid "It is not recommended to use this feature if you intend to export changes back to CVS again later with 'git cvsexportcommit'."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:173
-msgid ""
-"Generate a `$GIT_DIR/cvs-revisions` file containing a mapping from CVS "
-"revision numbers to newly-created Git commit IDs. The generated file will "
-"contain one line for each (filename, revision) pair imported; each line will "
-"look like"
+#, priority:100
+msgid "Generate a `$GIT_DIR/cvs-revisions` file containing a mapping from CVS revision numbers to newly-created Git commit IDs. The generated file will contain one line for each (filename, revision) pair imported; each line will look like"
msgstr ""
#. type: delimited block -
#: en/git-cvsimport.txt:176
-#, no-wrap
+#, no-wrap, priority:100
msgid "src/widget.c 1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7\n"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:180
-msgid ""
-"The revision data is appended to the file if it already exists, for use when "
-"doing incremental imports."
+#, priority:100
+msgid "The revision data is appended to the file if it already exists, for use when doing incremental imports."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:183
-msgid ""
-"This option may be useful if you have CVS revision numbers stored in commit "
-"messages, bug-tracking systems, email archives, and the like."
+#, priority:100
+msgid "This option may be useful if you have CVS revision numbers stored in commit messages, bug-tracking systems, email archives, and the like."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:186
+#, priority:100
msgid "Print a short usage message and exit."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:190
+#, priority:100
msgid "If `-v` is specified, the script reports what it is doing."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:193
-msgid ""
-"Otherwise, success is indicated the Unix way, i.e. by simply exiting with a "
-"zero exit status."
+#, priority:100
+msgid "Otherwise, success is indicated the Unix way, i.e. by simply exiting with a zero exit status."
msgstr ""
#. type: Title -
#: en/git-cvsimport.txt:196
-#, no-wrap
+#, no-wrap, priority:100
msgid "ISSUES"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:198
+#, priority:100
msgid "Problems related to timestamps:"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:202
-msgid ""
-"If timestamps of commits in the CVS repository are not stable enough to be "
-"used for ordering commits changes may show up in the wrong order."
+#, priority:100
+msgid "If timestamps of commits in the CVS repository are not stable enough to be used for ordering commits changes may show up in the wrong order."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:204
-msgid ""
-"If any files were ever \"cvs import\"ed more than once (e.g., import of more "
-"than one vendor release) the HEAD contains the wrong content."
+#, priority:100
+msgid "If any files were ever \"cvs import\"ed more than once (e.g., import of more than one vendor release) the HEAD contains the wrong content."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:207
-msgid ""
-"If the timestamp order of different files cross the revision order within "
-"the commit matching time window the order of commits may be wrong."
+#, priority:100
+msgid "If the timestamp order of different files cross the revision order within the commit matching time window the order of commits may be wrong."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:209
+#, priority:100
msgid "Problems related to branches:"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:211
+#, priority:100
msgid "Branches on which no commits have been made are not imported."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:213
-msgid ""
-"All files from the branching point are added to a branch even if never added "
-"in CVS."
+#, priority:100
+msgid "All files from the branching point are added to a branch even if never added in CVS."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:216
-msgid ""
-"This applies to files added to the source branch *after* a daughter branch "
-"was created: if previously no commit was made on the daughter branch they "
-"will erroneously be added to the daughter branch in git."
+#, priority:100
+msgid "This applies to files added to the source branch *after* a daughter branch was created: if previously no commit was made on the daughter branch they will erroneously be added to the daughter branch in git."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:218
+#, priority:100
msgid "Problems related to tags:"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:220
+#, priority:100
msgid "Multiple tags on the same revision are not imported."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:223
-msgid ""
-"If you suspect that any of these issues may apply to the repository you want "
-"to import, consider using cvs2git:"
+#, priority:100
+msgid "If you suspect that any of these issues may apply to the repository you want to import, consider using cvs2git:"
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:225
+#, priority:100
msgid "cvs2git (part of cvs2svn), `http://subversion.apache.org/`"
msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-cvsserver(1)"
msgstr "git-cvsserver(1)"
#. type: Plain text
#: en/git-cvsserver.txt:7
+#, priority:100
msgid "git-cvsserver - A CVS server emulator for Git"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:12
+#, priority:100
msgid "SSH:"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:16
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"export CVS_SERVER=\"git cvsserver\"\n"
"'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
@@ -19722,198 +17086,181 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:18
+#, priority:100
msgid "pserver (/etc/inetd.conf):"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:21
-#, no-wrap
-msgid ""
-"cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver "
-"pserver\n"
+#, no-wrap, priority:100
+msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:23
+#, priority:100
msgid "Usage:"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:26
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:33
-msgid ""
-"All these options obviously only make sense if enforced by the server side. "
-"They have been implemented to resemble the linkgit:git-daemon[1] options as "
-"closely as possible."
+#, priority:100
+msgid "All these options obviously only make sense if enforced by the server side. They have been implemented to resemble the linkgit:git-daemon[1] options as closely as possible."
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:34
-#, no-wrap
+#, no-wrap, priority:100
msgid "--base-path <path>"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:36
+#, priority:100
msgid "Prepend 'path' to requested CVSROOT"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:49
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--strict-paths"
msgstr "--strict-paths"
#. type: Plain text
#: en/git-cvsserver.txt:39
+#, priority:100
msgid "Don't allow recursing into subdirectories"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:78
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--export-all"
msgstr "--export-all"
#. type: Plain text
#: en/git-cvsserver.txt:43
-msgid ""
-"Don't check for `gitcvs.enabled` in config. You also have to specify a list "
-"of allowed directories (see below) if you want to use this option."
+#, priority:100
+msgid "Don't check for `gitcvs.enabled` in config. You also have to specify a list of allowed directories (see below) if you want to use this option."
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "-V"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:42
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--version"
msgstr "--version"
#. type: Plain text
#: en/git-cvsserver.txt:47
+#, priority:100
msgid "Print version information and exit"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:45
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--help"
msgstr "--help"
#. type: Plain text
#: en/git-cvsserver.txt:52
+#, priority:100
msgid "Print usage information and exit"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:58
-msgid ""
-"You can specify a list of allowed directories. If no directories are given, "
-"all are allowed. This is an additional restriction, gitcvs access still "
-"needs to be enabled by the `gitcvs.enabled` config option unless "
-"`--export-all` was given, too."
+#, priority:100
+msgid "You can specify a list of allowed directories. If no directories are given, all are allowed. This is an additional restriction, gitcvs access still needs to be enabled by the `gitcvs.enabled` config option unless `--export-all` was given, too."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:64
+#, priority:100
msgid "This application is a CVS emulation layer for Git."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:68
-msgid ""
-"It is highly functional. However, not all methods are implemented, and for "
-"those methods that are implemented, not all switches are implemented."
+#, priority:100
+msgid "It is highly functional. However, not all methods are implemented, and for those methods that are implemented, not all switches are implemented."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:71
-msgid ""
-"Testing has been done using both the CLI CVS client, and the Eclipse CVS "
-"plugin. Most functionality works fine with both of these clients."
+#, priority:100
+msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS plugin. Most functionality works fine with both of these clients."
msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
-#, no-wrap
+#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:76
+#, priority:100
msgid "CVS clients cannot tag, branch or perform Git merges."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:80
-msgid ""
-"'git-cvsserver' maps Git branches to CVS modules. This is very different "
-"from what most CVS users would expect since in CVS modules usually represent "
-"one or more directories."
+#, priority:100
+msgid "'git-cvsserver' maps Git branches to CVS modules. This is very different from what most CVS users would expect since in CVS modules usually represent one or more directories."
msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:82
-#, no-wrap
+#, no-wrap, priority:100
msgid "INSTALLATION"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:86
-msgid ""
-"If you are going to offer CVS access via pserver, add a line in "
-"/etc/inetd.conf like"
+#, priority:100
+msgid "If you are going to offer CVS access via pserver, add a line in /etc/inetd.conf like"
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:90
-#, no-wrap
+#, no-wrap, priority:100
msgid " cvspserver stream tcp nowait nobody git-cvsserver pserver\n"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:96
-msgid ""
-"Note: Some inetd servers let you specify the name of the executable "
-"independently of the value of argv[0] (i.e. the name the program assumes it "
-"was executed with). In this case the correct line in /etc/inetd.conf looks "
-"like"
+#, priority:100
+msgid "Note: Some inetd servers let you specify the name of the executable independently of the value of argv[0] (i.e. the name the program assumes it was executed with). In this case the correct line in /etc/inetd.conf looks like"
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:99
-#, no-wrap
-msgid ""
-" cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver "
-"pserver\n"
+#, no-wrap, priority:100
+msgid " cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:106
-msgid ""
-"Only anonymous access is provided by pserve by default. To commit you will "
-"have to create pserver accounts, simply add a gitcvs.authdb setting in the "
-"config file of the repositories you want the cvsserver to allow writes to, "
-"for example:"
+#, priority:100
+msgid "Only anonymous access is provided by pserve by default. To commit you will have to create pserver accounts, simply add a gitcvs.authdb setting in the config file of the repositories you want the cvsserver to allow writes to, for example:"
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:111
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" [gitcvs]\n"
"\tauthdb = /etc/cvsserver/passwd\n"
@@ -19921,14 +17268,13 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:115
-msgid ""
-"The format of these files is username followed by the encrypted password, "
-"for example:"
+#, priority:100
+msgid "The format of these files is username followed by the encrypted password, for example:"
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:119
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" myuser:$1Oyx5r9mdGZ2\n"
" myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./\n"
@@ -19936,82 +17282,67 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:123
-msgid ""
-"You can use the 'htpasswd' facility that comes with Apache to make these "
-"files, but Apache's MD5 crypt method differs from the one used by most C "
-"library's crypt() function, so don't use the -m option."
+#, priority:100
+msgid "You can use the 'htpasswd' facility that comes with Apache to make these files, but Apache's MD5 crypt method differs from the one used by most C library's crypt() function, so don't use the -m option."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:125
+#, priority:100
msgid "Alternatively you can produce the password with perl's crypt() operator:"
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:127
-#, no-wrap
-msgid ""
-" perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, "
-"crypt($user, $pass)' $USER password\n"
+#, no-wrap, priority:100
+msgid " perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, crypt($user, $pass)' $USER password\n"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:130
+#, priority:100
msgid "Then provide your password via the pserver method, for example:"
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:132
-#, no-wrap
-msgid ""
-" cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co "
-"<HEAD_name>\n"
+#, no-wrap, priority:100
+msgid " cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>\n"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:136
-msgid ""
-"No special setup is needed for SSH access, other than having Git tools in "
-"the PATH. If you have clients that do not accept the CVS_SERVER environment "
-"variable, you can rename 'git-cvsserver' to `cvs`."
+#, priority:100
+msgid "No special setup is needed for SSH access, other than having Git tools in the PATH. If you have clients that do not accept the CVS_SERVER environment variable, you can rename 'git-cvsserver' to `cvs`."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:139
-msgid ""
-"Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER "
-"directly in CVSROOT like"
+#, priority:100
+msgid "Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER directly in CVSROOT like"
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:142
-#, no-wrap
-msgid ""
-"cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co "
-"<HEAD_name>\n"
+#, no-wrap, priority:100
+msgid "cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co <HEAD_name>\n"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:148
-msgid ""
-"This has the advantage that it will be saved in your 'CVS/Root' files and "
-"you don't need to worry about always setting the correct environment "
-"variable. SSH users restricted to 'git-shell' don't need to override the "
-"default with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to "
-"mean 'git-cvsserver' and pretends that the other end runs the real 'cvs' "
-"better."
+#, priority:100
+msgid "This has the advantage that it will be saved in your 'CVS/Root' files and you don't need to worry about always setting the correct environment variable. SSH users restricted to 'git-shell' don't need to override the default with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean 'git-cvsserver' and pretends that the other end runs the real 'cvs' better."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:151
-msgid ""
-"For each repo that you want accessible from CVS you need to edit config in "
-"the repo and add the following section."
+#, priority:100
+msgid "For each repo that you want accessible from CVS you need to edit config in the repo and add the following section."
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:158
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" [gitcvs]\n"
" enabled=1\n"
@@ -20021,32 +17352,25 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:164
-msgid ""
-"Note: you need to ensure each user that is going to invoke 'git-cvsserver' "
-"has write access to the log file and to the database (see "
-"<<dbbackend,Database Backend>>. If you want to offer write access over SSH, "
-"the users of course also need write access to the Git repository itself."
+#, priority:100
+msgid "Note: you need to ensure each user that is going to invoke 'git-cvsserver' has write access to the log file and to the database (see <<dbbackend,Database Backend>>. If you want to offer write access over SSH, the users of course also need write access to the Git repository itself."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:167
-msgid ""
-"You also need to ensure that each repository is \"bare\" (without a Git "
-"index file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]."
+#, priority:100
+msgid "You also need to ensure that each repository is \"bare\" (without a Git index file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:173
-msgid ""
-"All configuration variables can also be overridden for a specific method of "
-"access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The "
-"following example configuration would disable pserver access while still "
-"allowing access over SSH."
+#, priority:100
+msgid "All configuration variables can also be overridden for a specific method of access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The following example configuration would disable pserver access while still allowing access over SSH."
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:176
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" [gitcvs]\n"
" enabled=0\n"
@@ -20054,7 +17378,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:179
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" [gitcvs \"ext\"]\n"
" enabled=1\n"
@@ -20062,18 +17386,13 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:186
-msgid ""
-"If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout "
-"command, automatically saving it in your 'CVS/Root' files, then you need to "
-"set them explicitly in your environment. CVSROOT should be set as per "
-"normal, but the directory should point at the appropriate Git repo. As "
-"above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be "
-"set to 'git-cvsserver'."
+#, priority:100
+msgid "If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout command, automatically saving it in your 'CVS/Root' files, then you need to set them explicitly in your environment. CVSROOT should be set as per normal, but the directory should point at the appropriate Git repo. As above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be set to 'git-cvsserver'."
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:191
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" export CVSROOT=:ext:user@server:/var/git/project.git\n"
" export CVS_SERVER=\"git cvsserver\"\n"
@@ -20081,504 +17400,409 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:198
-msgid ""
-"For SSH clients that will make commits, make sure their server-side "
-".ssh/environment files (or .bashrc, etc., according to their specific shell) "
-"export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, "
-"GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login "
-"shell is bash, .bashrc may be a reasonable alternative."
+#, priority:100
+msgid "For SSH clients that will make commits, make sure their server-side .ssh/environment files (or .bashrc, etc., according to their specific shell) export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login shell is bash, .bashrc may be a reasonable alternative."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:204
-msgid ""
-"Clients should now be able to check out the project. Use the CVS 'module' "
-"name to indicate what Git 'head' you want to check out. This also sets the "
-"name of your newly checked-out directory, unless you tell it otherwise with "
-"`-d <dir_name>`. For example, this checks out 'master' branch to the "
-"`project-master` directory:"
+#, priority:100
+msgid "Clients should now be able to check out the project. Use the CVS 'module' name to indicate what Git 'head' you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with `-d <dir_name>`. For example, this checks out 'master' branch to the `project-master` directory:"
msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:207
-#, no-wrap
+#, no-wrap, priority:100
msgid " cvs co -d project-master master\n"
msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:211
-#, no-wrap
+#, no-wrap, priority:100
msgid "DATABASE BACKEND"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:217
-msgid ""
-"'git-cvsserver' uses one database per Git head (i.e. CVS module) to store "
-"information about the repository to maintain consistent CVS revision "
-"numbers. The database needs to be updated (i.e. written to) after every "
-"commit."
+#, priority:100
+msgid "'git-cvsserver' uses one database per Git head (i.e. CVS module) to store information about the repository to maintain consistent CVS revision numbers. The database needs to be updated (i.e. written to) after every commit."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:222
-msgid ""
-"If the commit is done directly by using `git` (as opposed to using "
-"'git-cvsserver') the update will need to happen on the next repository "
-"access by 'git-cvsserver', independent of access method and requested "
-"operation."
+#, priority:100
+msgid "If the commit is done directly by using `git` (as opposed to using 'git-cvsserver') the update will need to happen on the next repository access by 'git-cvsserver', independent of access method and requested operation."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:227
-msgid ""
-"That means that even if you offer only read access (e.g. by using the "
-"pserver method), 'git-cvsserver' should have write access to the database to "
-"work reliably (otherwise you need to make sure that the database is up to "
-"date any time 'git-cvsserver' is executed)."
+#, priority:100
+msgid "That means that even if you offer only read access (e.g. by using the pserver method), 'git-cvsserver' should have write access to the database to work reliably (otherwise you need to make sure that the database is up to date any time 'git-cvsserver' is executed)."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:234
-msgid ""
-"By default it uses SQLite databases in the Git directory, named "
-"`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates "
-"temporary files in the same directory as the database file on write so it "
-"might not be enough to grant the users using 'git-cvsserver' write access to "
-"the database file without granting them write access to the directory, too."
+#, priority:100
+msgid "By default it uses SQLite databases in the Git directory, named `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using 'git-cvsserver' write access to the database file without granting them write access to the directory, too."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:246
-msgid ""
-"The database cannot be reliably regenerated in a consistent form after the "
-"branch it is tracking has changed. Example: For merged branches, "
-"'git-cvsserver' only tracks one branch of development, and after a 'git "
-"merge' an incrementally updated database may track a different branch than a "
-"database regenerated from scratch, causing inconsistent CVS revision "
-"numbers. `git-cvsserver` has no way of knowing which branch it would have "
-"picked if it had been run incrementally pre-merge. So if you have to fully "
-"or partially (from old backup) regenerate the database, you should be "
-"suspicious of pre-existing CVS sandboxes."
+#, priority:100
+msgid "The database cannot be reliably regenerated in a consistent form after the branch it is tracking has changed. Example: For merged branches, 'git-cvsserver' only tracks one branch of development, and after a 'git merge' an incrementally updated database may track a different branch than a database regenerated from scratch, causing inconsistent CVS revision numbers. `git-cvsserver` has no way of knowing which branch it would have picked if it had been run incrementally pre-merge. So if you have to fully or partially (from old backup) regenerate the database, you should be suspicious of pre-existing CVS sandboxes."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:249
-msgid ""
-"You can configure the database backend with the following configuration "
-"variables:"
+#, priority:100
+msgid "You can configure the database backend with the following configuration variables:"
msgstr ""
#. type: Title ~
#: en/git-cvsserver.txt:251
-#, no-wrap
+#, no-wrap, priority:100
msgid "Configuring database backend"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:256
-msgid ""
-"'git-cvsserver' uses the Perl DBI module. Please also read its documentation "
-"if changing these variables, especially about `DBI->connect()`."
+#, priority:100
+msgid "'git-cvsserver' uses the Perl DBI module. Please also read its documentation if changing these variables, especially about `DBI->connect()`."
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:257
-#, no-wrap
+#, no-wrap, priority:100
msgid "gitcvs.dbName"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:263
-msgid ""
-"Database name. The exact meaning depends on the selected database driver, "
-"for SQLite this is a filename. Supports variable substitution (see "
-"below). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'"
+#, priority:100
+msgid "Database name. The exact meaning depends on the selected database driver, for SQLite this is a filename. Supports variable substitution (see below). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:264
-#, no-wrap
+#, no-wrap, priority:100
msgid "gitcvs.dbDriver"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:272
-msgid ""
-"Used DBI driver. You can specify any available driver for this here, but it "
-"might not work. cvsserver is tested with 'DBD::SQLite', reported to work "
-"with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard "
-"this as an experimental feature. May not contain colons (`:`). Default: "
-"'SQLite'"
+#, priority:100
+msgid "Used DBI driver. You can specify any available driver for this here, but it might not work. cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard this as an experimental feature. May not contain colons (`:`). Default: 'SQLite'"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:273
-#, no-wrap
+#, no-wrap, priority:100
msgid "gitcvs.dbuser"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:277
-msgid ""
-"Database user. Only useful if setting `dbDriver`, since SQLite has no "
-"concept of database users. Supports variable substitution (see below)."
+#, priority:100
+msgid "Database user. Only useful if setting `dbDriver`, since SQLite has no concept of database users. Supports variable substitution (see below)."
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:278
-#, no-wrap
+#, no-wrap, priority:100
msgid "gitcvs.dbPass"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:281
-msgid ""
-"Database password. Only useful if setting `dbDriver`, since SQLite has no "
-"concept of database passwords."
+#, priority:100
+msgid "Database password. Only useful if setting `dbDriver`, since SQLite has no concept of database passwords."
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:282
-#, no-wrap
+#, no-wrap, priority:100
msgid "gitcvs.dbTableNamePrefix"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:286
-msgid ""
-"Database table name prefix. Supports variable substitution (see below). "
-"Any non-alphabetic characters will be replaced with underscores."
+#, priority:100
+msgid "Database table name prefix. Supports variable substitution (see below). Any non-alphabetic characters will be replaced with underscores."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:288
-msgid ""
-"All variables can also be set per access method, see "
-"<<configaccessmethod,above>>."
+#, priority:100
+msgid "All variables can also be set per access method, see <<configaccessmethod,above>>."
msgstr ""
#. type: Title ^
#: en/git-cvsserver.txt:290
-#, no-wrap
+#, no-wrap, priority:100
msgid "Variable substitution"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:292
+#, priority:100
msgid "In `dbDriver` and `dbUser` you can use the following variables:"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:293
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "%G"
msgstr "%G"
#. type: Plain text
#: en/git-cvsserver.txt:295
+#, priority:100
msgid "Git directory name"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:295
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "%g"
msgstr "%g"
#. type: Plain text
#: en/git-cvsserver.txt:300
-msgid ""
-"Git directory name, where all characters except for alphanumeric ones, `.`, "
-"and `-` are replaced with `_` (this should make it easier to use the "
-"directory name in a filename if wanted)"
+#, priority:100
+msgid "Git directory name, where all characters except for alphanumeric ones, `.`, and `-` are replaced with `_` (this should make it easier to use the directory name in a filename if wanted)"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:300
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "%m"
msgstr "%m"
#. type: Plain text
#: en/git-cvsserver.txt:302
+#, priority:100
msgid "CVS module/Git head name"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:302
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "%a"
msgstr "%a"
#. type: Plain text
#: en/git-cvsserver.txt:304
+#, priority:100
msgid "access method (one of \"ext\" or \"pserver\")"
msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:304
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "%u"
msgstr "%u"
#. type: Plain text
#: en/git-cvsserver.txt:308
-msgid ""
-"Name of the user running 'git-cvsserver'. If no name can be determined, the "
-"numeric uid is used."
+#, priority:100
+msgid "Name of the user running 'git-cvsserver'. If no name can be determined, the numeric uid is used."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:314
-msgid ""
-"These variables obviate the need for command-line options in some "
-"circumstances, allowing easier restricted usage through git-shell."
+#, priority:100
+msgid "These variables obviate the need for command-line options in some circumstances, allowing easier restricted usage through git-shell."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:316
+#, priority:100
msgid "GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:320
-msgid ""
-"GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The repository "
-"must still be configured to allow access through git-cvsserver, as described "
-"above."
+#, priority:100
+msgid "GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The repository must still be configured to allow access through git-cvsserver, as described above."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:323
-msgid ""
-"When these environment variables are set, the corresponding command-line "
-"arguments may not be used."
+#, priority:100
+msgid "When these environment variables are set, the corresponding command-line arguments may not be used."
msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:325
-#, no-wrap
+#, no-wrap, priority:100
msgid "ECLIPSE CVS CLIENT NOTES"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:328
+#, priority:100
msgid "To get a checkout with the Eclipse CVS client:"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:330
+#, priority:100
msgid "Select \"Create a new project -> From CVS checkout\""
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:332
-msgid ""
-"Create a new location. See the notes below for details on how to choose the "
-"right protocol."
+#, priority:100
+msgid "Create a new location. See the notes below for details on how to choose the right protocol."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:335
-msgid ""
-"Browse the 'modules' available. It will give you a list of the heads in the "
-"repository. You will not be able to browse the tree from there. Only the "
-"heads."
+#, priority:100
+msgid "Browse the 'modules' available. It will give you a list of the heads in the repository. You will not be able to browse the tree from there. Only the heads."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:337
-msgid ""
-"Pick `HEAD` when it asks what branch/tag to check out. Untick the \"launch "
-"commit wizard\" to avoid committing the .project file."
+#, priority:100
+msgid "Pick `HEAD` when it asks what branch/tag to check out. Untick the \"launch commit wizard\" to avoid committing the .project file."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:343
-msgid ""
-"Protocol notes: If you are using anonymous access via pserver, just select "
-"that. Those using SSH access should choose the 'ext' protocol, and "
-"configure 'ext' access on the Preferences->Team->CVS->ExtConnection "
-"pane. Set CVS_SERVER to \"`git cvsserver`\". Note that password support is "
-"not good when using 'ext', you will definitely want to have SSH keys setup."
+#, priority:100
+msgid "Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the 'ext' protocol, and configure 'ext' access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to \"`git cvsserver`\". Note that password support is not good when using 'ext', you will definitely want to have SSH keys setup."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:348
-msgid ""
-"Alternatively, you can just use the non-standard extssh protocol that "
-"Eclipse offer. In that case CVS_SERVER is ignored, and you will have to "
-"replace the cvs utility on the server with 'git-cvsserver' or manipulate "
-"your `.bashrc` so that calling 'cvs' effectively calls 'git-cvsserver'."
+#, priority:100
+msgid "Alternatively, you can just use the non-standard extssh protocol that Eclipse offer. In that case CVS_SERVER is ignored, and you will have to replace the cvs utility on the server with 'git-cvsserver' or manipulate your `.bashrc` so that calling 'cvs' effectively calls 'git-cvsserver'."
msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:350
-#, no-wrap
+#, no-wrap, priority:100
msgid "CLIENTS KNOWN TO WORK"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:353
+#, priority:100
msgid "CVS 1.12.9 on Debian"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:354
+#, priority:100
msgid "CVS 1.11.17 on MacOSX (from Fink package)"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:355
+#, priority:100
msgid "Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes)"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:356
+#, priority:100
msgid "TortoiseCVS"
msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:358
-#, no-wrap
+#, no-wrap, priority:100
msgid "OPERATIONS SUPPORTED"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:362
-msgid ""
-"All the operations required for normal use are supported, including "
-"checkout, diff, status, update, log, add, remove, commit."
+#, priority:100
+msgid "All the operations required for normal use are supported, including checkout, diff, status, update, log, add, remove, commit."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:371
-msgid ""
-"Most CVS command arguments that read CVS tags or revision numbers (typically "
-"-r) work, and also support any git refspec (tag, branch, commit ID, etc). "
-"However, CVS revision numbers for non-default branches are not well "
-"emulated, and cvs log does not show tags or branches at all. "
-"(Non-main-branch CVS revision numbers superficially resemble CVS revision "
-"numbers, but they actually encode a git commit ID directly, rather than "
-"represent the number of revisions since the branch point.)"
+#, priority:100
+msgid "Most CVS command arguments that read CVS tags or revision numbers (typically -r) work, and also support any git refspec (tag, branch, commit ID, etc). However, CVS revision numbers for non-default branches are not well emulated, and cvs log does not show tags or branches at all. (Non-main-branch CVS revision numbers superficially resemble CVS revision numbers, but they actually encode a git commit ID directly, rather than represent the number of revisions since the branch point.)"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:385
-msgid ""
-"Note that there are two ways to checkout a particular branch. As described "
-"elsewhere on this page, the \"module\" parameter of cvs checkout is "
-"interpreted as a branch name, and it becomes the main branch. It remains "
-"the main branch for a given sandbox even if you temporarily make another "
-"branch sticky with cvs update -r. Alternatively, the -r argument can "
-"indicate some other branch to actually checkout, even though the module is "
-"still the \"main\" branch. Tradeoffs (as currently implemented): Each new "
-"\"module\" creates a new database on disk with a history for the given "
-"module, and after the database is created, operations against that main "
-"branch are fast. Or alternatively, -r doesn't take any extra disk space, "
-"but may be significantly slower for many operations, like cvs update."
+#, priority:100
+msgid "Note that there are two ways to checkout a particular branch. As described elsewhere on this page, the \"module\" parameter of cvs checkout is interpreted as a branch name, and it becomes the main branch. It remains the main branch for a given sandbox even if you temporarily make another branch sticky with cvs update -r. Alternatively, the -r argument can indicate some other branch to actually checkout, even though the module is still the \"main\" branch. Tradeoffs (as currently implemented): Each new \"module\" creates a new database on disk with a history for the given module, and after the database is created, operations against that main branch are fast. Or alternatively, -r doesn't take any extra disk space, but may be significantly slower for many operations, like cvs update."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:398
-msgid ""
-"If you want to refer to a git refspec that has characters that are not "
-"allowed by CVS, you have two options. First, it may just work to supply the "
-"git refspec directly to the appropriate CVS -r argument; some CVS clients "
-"don't seem to do much sanity checking of the argument. Second, if that "
-"fails, you can use a special character escape mechanism that only uses "
-"characters that are valid in CVS tags. A sequence of 4 or 5 characters of "
-"the form (underscore (`\"_\"`), dash (`\"-\"`), one or two characters, and "
-"dash (`\"-\"`)) can encode various characters based on the one or two "
-"letters: `\"s\"` for slash (`\"/\"`), `\"p\"` for period (`\".\"`), `\"u\"` "
-"for underscore (`\"_\"`), or two hexadecimal digits for any byte value at "
-"all (typically an ASCII number, or perhaps a part of a UTF-8 encoded "
-"character)."
+#, priority:100
+msgid "If you want to refer to a git refspec that has characters that are not allowed by CVS, you have two options. First, it may just work to supply the git refspec directly to the appropriate CVS -r argument; some CVS clients don't seem to do much sanity checking of the argument. Second, if that fails, you can use a special character escape mechanism that only uses characters that are valid in CVS tags. A sequence of 4 or 5 characters of the form (underscore (`\"_\"`), dash (`\"-\"`), one or two characters, and dash (`\"-\"`)) can encode various characters based on the one or two letters: `\"s\"` for slash (`\"/\"`), `\"p\"` for period (`\".\"`), `\"u\"` for underscore (`\"_\"`), or two hexadecimal digits for any byte value at all (typically an ASCII number, or perhaps a part of a UTF-8 encoded character)."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:401
-msgid ""
-"Legacy monitoring operations are not supported (edit, watch and related). "
-"Exports and tagging (tags and branches) are not supported at this stage."
+#, priority:100
+msgid "Legacy monitoring operations are not supported (edit, watch and related). Exports and tagging (tags and branches) are not supported at this stage."
msgstr ""
#. type: Title ~
#: en/git-cvsserver.txt:403
-#, no-wrap
+#, no-wrap, priority:100
msgid "CRLF Line Ending Conversions"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:408
-msgid ""
-"By default the server leaves the `-k` mode blank for all files, which causes "
-"the CVS client to treat them as a text files, subject to end-of-line "
-"conversion on some platforms."
+#, priority:100
+msgid "By default the server leaves the `-k` mode blank for all files, which causes the CVS client to treat them as a text files, subject to end-of-line conversion on some platforms."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:413
-msgid ""
-"You can make the server use the end-of-line conversion attributes to set the "
-"`-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. "
-"See linkgit:gitattributes[5] for more information about end-of-line "
-"conversion."
+#, priority:100
+msgid "You can make the server use the end-of-line conversion attributes to set the `-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. See linkgit:gitattributes[5] for more information about end-of-line conversion."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:422
-msgid ""
-"Alternatively, if `gitcvs.usecrlfattr` config is not enabled or the "
-"attributes do not allow automatic detection for a filename, then the server "
-"uses the `gitcvs.allBinary` config for the default setting. If "
-"`gitcvs.allBinary` is set, then file not otherwise specified will default to "
-"'-kb' mode. Otherwise the `-k` mode is left blank. But if `gitcvs.allBinary` "
-"is set to \"guess\", then the correct `-k` mode will be guessed based on the "
-"contents of the file."
+#, priority:100
+msgid "Alternatively, if `gitcvs.usecrlfattr` config is not enabled or the attributes do not allow automatic detection for a filename, then the server uses the `gitcvs.allBinary` config for the default setting. If `gitcvs.allBinary` is set, then file not otherwise specified will default to '-kb' mode. Otherwise the `-k` mode is left blank. But if `gitcvs.allBinary` is set to \"guess\", then the correct `-k` mode will be guessed based on the contents of the file."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:426
-msgid ""
-"For best consistency with 'cvs', it is probably best to override the "
-"defaults by setting `gitcvs.usecrlfattr` to true, and `gitcvs.allBinary` to "
-"\"guess\"."
+#, priority:100
+msgid "For best consistency with 'cvs', it is probably best to override the defaults by setting `gitcvs.usecrlfattr` to true, and `gitcvs.allBinary` to \"guess\"."
msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:428
-#, no-wrap
+#, no-wrap, priority:100
msgid "DEPENDENCIES"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:430
+#, priority:100
msgid "'git-cvsserver' depends on DBD::SQLite."
msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-daemon(1)"
msgstr "git-daemon(1)"
#. type: Plain text
#: en/git-daemon.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-daemon - A really simple server for Git repositories"
msgstr "Un servidor realmente simple para repositorios Git"
#. type: Plain text
#: en/git-daemon.txt:25
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git daemon' [--verbose] [--syslog] [--export-all]\n"
"\t [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n"
@@ -20598,515 +17822,427 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:31
-msgid ""
-"A really simple TCP Git daemon that normally listens on port "
-"\"DEFAULT_GIT_PORT\" aka 9418. It waits for a connection asking for a "
-"service, and will serve that service if it is enabled."
+#, priority:100
+msgid "A really simple TCP Git daemon that normally listens on port \"DEFAULT_GIT_PORT\" aka 9418. It waits for a connection asking for a service, and will serve that service if it is enabled."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:37
-msgid ""
-"It verifies that the directory has the magic file \"git-daemon-export-ok\", "
-"and it will refuse to export any Git directory that hasn't explicitly been "
-"marked for export this way (unless the `--export-all` parameter is "
-"specified). If you pass some directory paths as 'git daemon' arguments, you "
-"can further restrict the offers to a whitelist comprising of those."
+#, priority:100
+msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `--export-all` parameter is specified). If you pass some directory paths as 'git daemon' arguments, you can further restrict the offers to a whitelist comprising of those."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:41
-msgid ""
-"By default, only `upload-pack` service is enabled, which serves 'git "
-"fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', "
-"'git pull', and 'git clone'."
+#, priority:100
+msgid "By default, only `upload-pack` service is enabled, which serves 'git fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', 'git pull', and 'git clone'."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:44
-msgid ""
-"This is ideally suited for read-only updates, i.e., pulling from Git "
-"repositories."
+#, priority:100
+msgid "This is ideally suited for read-only updates, i.e., pulling from Git repositories."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:46
+#, priority:100
msgid "An `upload-archive` also exists to serve 'git archive'."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:54
-msgid ""
-"Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is "
-"\"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. "
-"'git daemon' will refuse to start when this option is enabled and no "
-"whitelist is specified."
+#, priority:100
+msgid "Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is \"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. 'git daemon' will refuse to start when this option is enabled and no whitelist is specified."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:55
-#, no-wrap
+#, no-wrap, priority:100
msgid "--base-path=<path>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:61
-msgid ""
-"Remap all the path requests as relative to the given path. This is sort of "
-"\"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on "
-"example.com, then if you later try to pull 'git://example.com/hello.git', "
-"'git daemon' will interpret the path as `/srv/git/hello.git`."
+#, priority:100
+msgid "Remap all the path requests as relative to the given path. This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as `/srv/git/hello.git`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:62
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--base-path-relaxed"
msgstr "--base-path-relaxed"
#. type: Plain text
#: en/git-daemon.txt:67
-msgid ""
-"If --base-path is enabled and repo lookup fails, with this option 'git "
-"daemon' will attempt to lookup without prefixing the base path. This is "
-"useful for switching to --base-path usage, while still allowing the old "
-"paths."
+#, priority:100
+msgid "If --base-path is enabled and repo lookup fails, with this option 'git daemon' will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:68
-#, no-wrap
+#, no-wrap, priority:100
msgid "--interpolated-path=<pathtemplate>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:77
-msgid ""
-"To support virtual hosting, an interpolated path template can be used to "
-"dynamically construct alternate paths. The template supports %H for the "
-"target hostname as supplied by the client but converted to all lowercase, "
-"%CH for the canonical hostname, %IP for the server's IP address, %P for the "
-"port number, and %D for the absolute path of the named repository. After "
-"interpolation, the path is validated against the directory whitelist."
+#, priority:100
+msgid "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory whitelist."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:82
-msgid ""
-"Allow pulling from all directories that look like Git repositories (have the "
-"'objects' and 'refs' subdirectories), even if they do not have the "
-"'git-daemon-export-ok' file."
+#, priority:100
+msgid "Allow pulling from all directories that look like Git repositories (have the 'objects' and 'refs' subdirectories), even if they do not have the 'git-daemon-export-ok' file."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--inetd"
msgstr "--inetd"
#. type: Plain text
#: en/git-daemon.txt:88
-msgid ""
-"Have the server run as an inetd service. Implies --syslog (may be overridden "
-"with `--log-destination=`). Incompatible with --detach, --port, --listen, "
-"--user and --group options."
+#, priority:100
+msgid "Have the server run as an inetd service. Implies --syslog (may be overridden with `--log-destination=`). Incompatible with --detach, --port, --listen, --user and --group options."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:89
-#, no-wrap
+#, no-wrap, priority:100
msgid "--listen=<host_or_ipaddr>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:96
-msgid ""
-"Listen on a specific IP address or hostname. IP addresses can be either an "
-"IPv4 address or an IPv6 address if supported. If IPv6 is not supported, "
-"then --listen=hostname is also not supported and --listen must be given an "
-"IPv4 address. Can be given more than once. Incompatible with `--inetd` "
-"option."
+#, priority:100
+msgid "Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with `--inetd` option."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:97
-#, no-wrap
+#, no-wrap, priority:100
msgid "--port=<n>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:99
+#, priority:100
msgid "Listen on an alternative port. Incompatible with `--inetd` option."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:100
-#, no-wrap
+#, no-wrap, priority:100
msgid "--init-timeout=<n>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:104
-msgid ""
-"Timeout (in seconds) between the moment the connection is established and "
-"the client request is received (typically a rather low value, since that "
-"should be basically immediate)."
+#, priority:100
+msgid "Timeout (in seconds) between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate)."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:105 en/git-upload-pack.txt:31
-#, no-wrap
+#, no-wrap, priority:100
msgid "--timeout=<n>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:109
-msgid ""
-"Timeout (in seconds) for specific client sub-requests. This includes the "
-"time it takes for the server to process the sub-request and the time spent "
-"waiting for the next client's request."
+#, priority:100
+msgid "Timeout (in seconds) for specific client sub-requests. This includes the time it takes for the server to process the sub-request and the time spent waiting for the next client's request."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:110
-#, no-wrap
+#, no-wrap, priority:100
msgid "--max-connections=<n>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:113
-msgid ""
-"Maximum number of concurrent clients, defaults to 32. Set it to zero for no "
-"limit."
+#, priority:100
+msgid "Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:114
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--syslog"
msgstr "--syslog"
#. type: Plain text
#: en/git-daemon.txt:116
+#, priority:100
msgid "Short for `--log-destination=syslog`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:117
-#, no-wrap
+#, no-wrap, priority:100
msgid "--log-destination=<destination>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:122
-msgid ""
-"Send log messages to the specified destination. Note that this option does "
-"not imply --verbose, thus by default only error conditions will be logged. "
-"The <destination> must be one of:"
+#, priority:100
+msgid "Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The <destination> must be one of:"
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:124
-#, no-wrap
+#, no-wrap, priority:100
msgid "stderr"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:129
-msgid ""
-"Write to standard error. Note that if `--detach` is specified, the process "
-"disconnects from the real standard error, making this destination "
-"effectively equivalent to `none`."
+#, priority:100
+msgid "Write to standard error. Note that if `--detach` is specified, the process disconnects from the real standard error, making this destination effectively equivalent to `none`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:129
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "syslog"
msgstr "--syslog"
#. type: Plain text
#: en/git-daemon.txt:131
+#, priority:100
msgid "Write to syslog, using the `git-daemon` identifier."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:133
+#, priority:100
msgid "Disable all logging."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:137
-msgid ""
-"The default destination is `syslog` if `--inetd` or `--detach` is specified, "
-"otherwise `stderr`."
+#, priority:100
+msgid "The default destination is `syslog` if `--inetd` or `--detach` is specified, otherwise `stderr`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:138
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--user-path"
msgstr "--user-path"
#. type: Labeled list
#: en/git-daemon.txt:139
-#, no-wrap
+#, no-wrap, priority:100
msgid "--user-path=<path>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:147
-msgid ""
-"Allow {tilde}user notation to be used in requests. When specified with no "
-"parameter, requests to git://host/{tilde}alice/foo is taken as a request to "
-"access 'foo' repository in the home directory of user `alice`. If "
-"`--user-path=path` is specified, the same request is taken as a request to "
-"access `path/foo` repository in the home directory of user `alice`."
+#, priority:100
+msgid "Allow {tilde}user notation to be used in requests. When specified with no parameter, requests to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. If `--user-path=path` is specified, the same request is taken as a request to access `path/foo` repository in the home directory of user `alice`."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:150
+#, priority:100
msgid "Log details about the incoming connections and requested files."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:151
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--reuseaddr"
msgstr "--reuseaddr"
#. type: Plain text
#: en/git-daemon.txt:155
-msgid ""
-"Use SO_REUSEADDR when binding the listening socket. This allows the server "
-"to restart without waiting for old connections to time out."
+#, priority:100
+msgid "Use SO_REUSEADDR when binding the listening socket. This allows the server to restart without waiting for old connections to time out."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:158
+#, priority:100
msgid "Detach from the shell. Implies --syslog."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:159
-#, no-wrap
+#, no-wrap, priority:100
msgid "--pid-file=<file>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:162
-msgid ""
-"Save the process id in 'file'. Ignored when the daemon is run under "
-"`--inetd`."
+#, priority:100
+msgid "Save the process id in 'file'. Ignored when the daemon is run under `--inetd`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:163
-#, no-wrap
+#, no-wrap, priority:100
msgid "--user=<user>"
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:164
-#, no-wrap
+#, no-wrap, priority:100
msgid "--group=<group>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:170
-msgid ""
-"Change daemon's uid and gid before entering the service loop. When only "
-"`--user` is given without `--group`, the primary group ID for the user is "
-"used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` "
-"and numeric IDs are not supported."
+#, priority:100
+msgid "Change daemon's uid and gid before entering the service loop. When only `--user` is given without `--group`, the primary group ID for the user is used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` and numeric IDs are not supported."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:174
-msgid ""
-"Giving these options is an error when used with `--inetd`; use the facility "
-"of inet daemon to achieve the same before spawning 'git daemon' if needed."
+#, priority:100
+msgid "Giving these options is an error when used with `--inetd`; use the facility of inet daemon to achieve the same before spawning 'git daemon' if needed."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:181
-msgid ""
-"Like many programs that switch user id, the daemon does not reset "
-"environment variables such as `$HOME` when it runs git programs, "
-"e.g. `upload-pack` and `receive-pack`. When using this option, you may also "
-"want to set and export `HOME` to point at the home directory of `<user>` "
-"before starting the daemon, and make sure any Git configuration files in "
-"that directory are readable by `<user>`."
+#, priority:100
+msgid "Like many programs that switch user id, the daemon does not reset environment variables such as `$HOME` when it runs git programs, e.g. `upload-pack` and `receive-pack`. When using this option, you may also want to set and export `HOME` to point at the home directory of `<user>` before starting the daemon, and make sure any Git configuration files in that directory are readable by `<user>`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:182
-#, no-wrap
+#, no-wrap, priority:100
msgid "--enable=<service>"
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:183
-#, no-wrap
+#, no-wrap, priority:100
msgid "--disable=<service>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:189
-msgid ""
-"Enable/disable the service site-wide per default. Note that a service "
-"disabled site-wide can still be enabled per repository if it is marked "
-"overridable and the repository enables the service with a configuration "
-"item."
+#, priority:100
+msgid "Enable/disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:190
-#, no-wrap
+#, no-wrap, priority:100
msgid "--allow-override=<service>"
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:191
-#, no-wrap
+#, no-wrap, priority:100
msgid "--forbid-override=<service>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:195
-msgid ""
-"Allow/forbid overriding the site-wide default with per repository "
-"configuration. By default, all the services may be overridden."
+#, priority:100
+msgid "Allow/forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:196
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]informative-errors"
msgstr "--[no-]informative-errors"
#. type: Plain text
#: en/git-daemon.txt:204
-msgid ""
-"When informative errors are turned on, git-daemon will report more verbose "
-"errors to the client, differentiating conditions like \"no such repository\" "
-"from \"repository not exported\". This is more convenient for clients, but "
-"may leak information about the existence of unexported repositories. When "
-"informative errors are not enabled, all errors report \"access denied\" to "
-"the client. The default is --no-informative-errors."
+#, priority:100
+msgid "When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like \"no such repository\" from \"repository not exported\". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report \"access denied\" to the client. The default is --no-informative-errors."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:205
-#, no-wrap
+#, no-wrap, priority:100
msgid "--access-hook=<path>"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:215
-msgid ""
-"Every time a client connects, first run an external command specified by the "
-"<path> with service name (e.g. \"upload-pack\"), path to the repository, "
-"hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) "
-"as its command-line arguments. The external command can decide to decline "
-"the service by exiting with a non-zero status (or to allow it by exiting "
-"with a zero status). It can also look at the $REMOTE_ADDR and "
-"`$REMOTE_PORT` environment variables to learn about the requestor when "
-"making this decision."
+#, priority:100
+msgid "Every time a client connects, first run an external command specified by the <path> with service name (e.g. \"upload-pack\"), path to the repository, hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) as its command-line arguments. The external command can decide to decline the service by exiting with a non-zero status (or to allow it by exiting with a zero status). It can also look at the $REMOTE_ADDR and `$REMOTE_PORT` environment variables to learn about the requestor when making this decision."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:219
-msgid ""
-"The external command can optionally write a single line to its standard "
-"output to be sent to the requestor as an error message when it declines the "
-"service."
+#, priority:100
+msgid "The external command can optionally write a single line to its standard output to be sent to the requestor as an error message when it declines the service."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:224
-msgid ""
-"A directory to add to the whitelist of allowed directories. Unless "
-"--strict-paths is specified this will also include subdirectories of each "
-"named directory."
+#, priority:100
+msgid "A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory."
msgstr ""
#. type: Title -
#: en/git-daemon.txt:226 en/git-http-backend.txt:33
-#, no-wrap
+#, no-wrap, priority:100
msgid "SERVICES"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:234
-msgid ""
-"These services can be globally enabled/disabled using the command-line "
-"options of this command. If finer-grained control is desired (e.g. to allow "
-"'git archive' to be run against only in a few selected repositories the "
-"daemon serves), the per-repository configuration file can be used to enable "
-"or disable them."
+#, priority:100
+msgid "These services can be globally enabled/disabled using the command-line options of this command. If finer-grained control is desired (e.g. to allow 'git archive' to be run against only in a few selected repositories the daemon serves), the per-repository configuration file can be used to enable or disable them."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:235
-#, no-wrap
+#, no-wrap, priority:100
msgid "upload-pack"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:240
-msgid ""
-"This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by "
-"default, but a repository can disable it by setting `daemon.uploadpack` "
-"configuration item to `false`."
+#, priority:100
+msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:241
-#, no-wrap
+#, no-wrap, priority:100
msgid "upload-archive"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:245
-msgid ""
-"This serves 'git archive --remote'. It is disabled by default, but a "
-"repository can enable it by setting `daemon.uploadarch` configuration item "
-"to `true`."
+#, priority:100
+msgid "This serves 'git archive --remote'. It is disabled by default, but a repository can enable it by setting `daemon.uploadarch` configuration item to `true`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:246
-#, no-wrap
+#, no-wrap, priority:100
msgid "receive-pack"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:255
-msgid ""
-"This serves 'git send-pack' clients, allowing anonymous push. It is "
-"disabled by default, as there is _no_ authentication in the protocol (in "
-"other words, anybody can push anything into the repository, including "
-"removal of refs). This is solely meant for a closed LAN setting where "
-"everybody is friendly. This service can be enabled by setting "
-"`daemon.receivepack` configuration item to `true`."
+#, priority:100
+msgid "This serves 'git send-pack' clients, allowing anonymous push. It is disabled by default, as there is _no_ authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting `daemon.receivepack` configuration item to `true`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:258
-#, no-wrap
+#, no-wrap, priority:100
msgid "We assume the following in /etc/services"
msgstr ""
#. type: delimited block -
#: en/git-daemon.txt:263
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ grep 9418 /etc/services\n"
"git\t\t9418/tcp\t\t# Git Version Control System\n"
@@ -21114,21 +18250,19 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:265
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git daemon' as inetd server"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:270
-msgid ""
-"To set up 'git daemon' as an inetd service that handles any repository under "
-"the whitelisted set of directories, /pub/foo and /pub/bar, place an entry "
-"like the following into /etc/inetd all on one line:"
+#, priority:100
+msgid "To set up 'git daemon' as an inetd service that handles any repository under the whitelisted set of directories, /pub/foo and /pub/bar, place an entry like the following into /etc/inetd all on one line:"
msgstr ""
#. type: delimited block -
#: en/git-daemon.txt:275
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tgit stream tcp nowait nobody /usr/bin/git\n"
"\t\tgit daemon --inetd --verbose --export-all\n"
@@ -21137,21 +18271,19 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:278
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git daemon' as inetd server for virtual hosts"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:283
-msgid ""
-"To set up 'git daemon' as an inetd service that handles repositories for "
-"different virtual hosts, `www.example.com` and `www.example.org`, place an "
-"entry like the following into `/etc/inetd` all on one line:"
+#, priority:100
+msgid "To set up 'git daemon' as an inetd service that handles repositories for different virtual hosts, `www.example.com` and `www.example.org`, place an entry like the following into `/etc/inetd` all on one line:"
msgstr ""
#. type: delimited block -
#: en/git-daemon.txt:291
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tgit stream tcp nowait nobody /usr/bin/git\n"
"\t\tgit daemon --inetd --verbose --export-all\n"
@@ -21163,31 +18295,25 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:299
-msgid ""
-"In this example, the root-level directory `/pub` will contain a subdirectory "
-"for each virtual host name supported. Further, both hosts advertise "
-"repositories simply as `git://www.example.com/software/repo.git`. For "
-"pre-1.4.0 clients, a symlink from `/software` into the appropriate default "
-"repository could be made as well."
+#, priority:100
+msgid "In this example, the root-level directory `/pub` will contain a subdirectory for each virtual host name supported. Further, both hosts advertise repositories simply as `git://www.example.com/software/repo.git`. For pre-1.4.0 clients, a symlink from `/software` into the appropriate default repository could be made as well."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:301
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git daemon' as regular daemon for virtual hosts"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:305
-msgid ""
-"To set up 'git daemon' as a regular, non-inetd service that handles "
-"repositories for multiple virtual hosts based on their IP addresses, start "
-"the daemon like this:"
+#, priority:100
+msgid "To set up 'git daemon' as a regular, non-inetd service that handles repositories for multiple virtual hosts based on their IP addresses, start the daemon like this:"
msgstr ""
#. type: delimited block -
#: en/git-daemon.txt:311
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tgit daemon --verbose --export-all\n"
"\t\t--interpolated-path=/pub/%IP/%D\n"
@@ -21197,29 +18323,25 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:317
-msgid ""
-"In this example, the root-level directory `/pub` will contain a subdirectory "
-"for each virtual host IP address supported. Repositories can still be "
-"accessed by hostname though, assuming they correspond to these IP addresses."
+#, priority:100
+msgid "In this example, the root-level directory `/pub` will contain a subdirectory for each virtual host IP address supported. Repositories can still be accessed by hostname though, assuming they correspond to these IP addresses."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:318
-#, no-wrap
+#, no-wrap, priority:100
msgid "selectively enable/disable services per repository"
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:323
-msgid ""
-"To enable 'git archive --remote' and disable 'git fetch' against a "
-"repository, have the following in the configuration file in the repository "
-"(that is the file 'config' next to `HEAD`, 'refs' and 'objects')."
+#, priority:100
+msgid "To enable 'git archive --remote' and disable 'git fetch' against a repository, have the following in the configuration file in the repository (that is the file 'config' next to `HEAD`, 'refs' and 'objects')."
msgstr ""
#. type: delimited block -
#: en/git-daemon.txt:328
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t[daemon]\n"
"\t\tuploadpack = false\n"
@@ -21228,266 +18350,208 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:337
-msgid ""
-"'git daemon' will set REMOTE_ADDR to the IP address of the client that "
-"connected to it, if the IP address is available. REMOTE_ADDR will be "
-"available in the environment of hooks called when services are performed."
+#, priority:100
+msgid "'git daemon' will set REMOTE_ADDR to the IP address of the client that connected to it, if the IP address is available. REMOTE_ADDR will be available in the environment of hooks called when services are performed."
msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "git-describe(1)"
msgstr "git-describe(1)"
#. type: Plain text
#: en/git-describe.txt:7
-#, fuzzy
-msgid ""
-"git-describe - Give an object a human readable name based on an available "
-"ref"
-msgstr ""
-"Dar a un objeto un nombre legible por humanos basado en una referencia "
-"disponible"
+#, fuzzy, priority:260
+msgid "git-describe - Give an object a human readable name based on an available ref"
+msgstr "Dar a un objeto un nombre legible por humanos basado en una referencia disponible"
#. type: Plain text
#: en/git-describe.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
-"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] "
-"[<commit-ish>...]\n"
-"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] "
-"--dirty[=<mark>]\n"
+"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n"
+"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]\n"
"'git describe' <blob>\n"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:24
-msgid ""
-"The command finds the most recent tag that is reachable from a commit. If "
-"the tag points to the commit, then only the tag is shown. Otherwise, it "
-"suffixes the tag name with the number of additional commits on top of the "
-"tagged object and the abbreviated object name of the most recent commit. The "
-"result is a \"human-readable\" object name which can also be used to "
-"identify the commit to other git commands."
+#, priority:260
+msgid "The command finds the most recent tag that is reachable from a commit. If the tag points to the commit, then only the tag is shown. Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object and the abbreviated object name of the most recent commit. The result is a \"human-readable\" object name which can also be used to identify the commit to other git commands."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:28
-msgid ""
-"By default (without --all or --tags) `git describe` only shows annotated "
-"tags. For more information about creating annotated tags see the -a and -s "
-"options to linkgit:git-tag[1]."
+#, priority:260
+msgid "By default (without --all or --tags) `git describe` only shows annotated tags. For more information about creating annotated tags see the -a and -s options to linkgit:git-tag[1]."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:34
-msgid ""
-"If the given object refers to a blob, it will be described as "
-"`<commit-ish>:<path>`, such that the blob can be found at `<path>` in the "
-"`<commit-ish>`, which itself describes the first commit in which this blob "
-"occurs in a reverse revision walk from HEAD."
+#, priority:260
+msgid "If the given object refers to a blob, it will be described as `<commit-ish>:<path>`, such that the blob can be found at `<path>` in the `<commit-ish>`, which itself describes the first commit in which this blob occurs in a reverse revision walk from HEAD."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:37
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:260
msgid "<commit-ish>..."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:39
+#, priority:260
msgid "Commit-ish object names to describe. Defaults to HEAD if omitted."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:40
-#, no-wrap
+#, no-wrap, priority:260
msgid "--dirty[=<mark>]"
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:41
-#, no-wrap
+#, no-wrap, priority:260
msgid "--broken[=<mark>]"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:49
-msgid ""
-"Describe the state of the working tree. When the working tree matches HEAD, "
-"the output is the same as \"git describe HEAD\". If the working tree has "
-"local modification \"-dirty\" is appended to it. If a repository is corrupt "
-"and Git cannot determine if there is local modification, Git will error out, "
-"unless `--broken' is given, which appends the suffix \"-broken\" instead."
+#, priority:260
+msgid "Describe the state of the working tree. When the working tree matches HEAD, the output is the same as \"git describe HEAD\". If the working tree has local modification \"-dirty\" is appended to it. If a repository is corrupt and Git cannot determine if there is local modification, Git will error out, unless `--broken' is given, which appends the suffix \"-broken\" instead."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:54
-msgid ""
-"Instead of using only the annotated tags, use any ref found in `refs/` "
-"namespace. This option enables matching any known branch, remote-tracking "
-"branch, or lightweight tag."
+#, priority:260
+msgid "Instead of using only the annotated tags, use any ref found in `refs/` namespace. This option enables matching any known branch, remote-tracking branch, or lightweight tag."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:59
-msgid ""
-"Instead of using only the annotated tags, use any tag found in `refs/tags` "
-"namespace. This option enables matching a lightweight (non-annotated) tag."
+#, priority:260
+msgid "Instead of using only the annotated tags, use any tag found in `refs/tags` namespace. This option enables matching a lightweight (non-annotated) tag."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--contains"
msgstr "--contains"
#. type: Plain text
#: en/git-describe.txt:64
-msgid ""
-"Instead of finding the tag that predates the commit, find the tag that comes "
-"after the commit, and thus contains it. Automatically implies --tags."
+#, priority:260
+msgid "Instead of finding the tag that predates the commit, find the tag that comes after the commit, and thus contains it. Automatically implies --tags."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:70
-msgid ""
-"Instead of using the default 7 hexadecimal digits as the abbreviated object "
-"name, use <n> digits, or as many digits as needed to form a unique object "
-"name. An <n> of 0 will suppress long format, only showing the closest tag."
+#, priority:260
+msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:71
-#, no-wrap
+#, no-wrap, priority:260
msgid "--candidates=<n>"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:77
-msgid ""
-"Instead of considering only the 10 most recent tags as candidates to "
-"describe the input commit-ish consider up to <n> candidates. Increasing <n> "
-"above 10 will take slightly longer but may produce a more accurate result. "
-"An <n> of 0 will cause only exact matches to be output."
+#, priority:260
+msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates. Increasing <n> above 10 will take slightly longer but may produce a more accurate result. An <n> of 0 will cause only exact matches to be output."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:78
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--exact-match"
msgstr "--exact-match"
#. type: Plain text
#: en/git-describe.txt:81
-msgid ""
-"Only output exact matches (a tag directly references the supplied commit). "
-"This is a synonym for --candidates=0."
+#, priority:260
+msgid "Only output exact matches (a tag directly references the supplied commit). This is a synonym for --candidates=0."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:82 en/git-ls-files.txt:159
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--debug"
msgstr "--debug"
#. type: Plain text
#: en/git-describe.txt:86
-msgid ""
-"Verbosely display information about the searching strategy being employed to "
-"standard error. The tag name will still be printed to standard out."
+#, priority:260
+msgid "Verbosely display information about the searching strategy being employed to standard error. The tag name will still be printed to standard out."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:95
-msgid ""
-"Always output the long format (the tag, the number of commits and the "
-"abbreviated commit name) even when it matches a tag. This is useful when "
-"you want to see parts of the commit object name in \"describe\" output, even "
-"when the commit in question happens to be a tagged version. Instead of just "
-"emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee "
-"(0th commit since tag v1.2 that points at object deadbee....)."
+#, ignore-ellipsis, priority:260
+msgid "Always output the long format (the tag, the number of commits and the abbreviated commit name) even when it matches a tag. This is useful when you want to see parts of the commit object name in \"describe\" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object deadbee....)."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:96
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:260
msgid "--match <pattern>"
msgstr "concordar <patr처n>"
#. type: Plain text
#: en/git-describe.txt:105
-msgid ""
-"Only consider tags matching the given `glob(7)` pattern, excluding the "
-"\"refs/tags/\" prefix. If used with `--all`, it also considers local "
-"branches and remote-tracking references matching the pattern, excluding "
-"respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of "
-"other types are never considered. If given multiple times, a list of "
-"patterns will be accumulated, and tags matching any of the patterns will be "
-"considered. Use `--no-match` to clear and reset the list of patterns."
+#, priority:260
+msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered. Use `--no-match` to clear and reset the list of patterns."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:106
-#, no-wrap
+#, no-wrap, priority:260
msgid "--exclude <pattern>"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:117
-msgid ""
-"Do not consider tags matching the given `glob(7)` pattern, excluding the "
-"\"refs/tags/\" prefix. If used with `--all`, it also does not consider local "
-"branches and remote-tracking references matching the pattern, excluding "
-"respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of "
-"other types are never considered. If given multiple times, a list of "
-"patterns will be accumulated and tags matching any of the patterns will be "
-"excluded. When combined with --match a tag will be considered when it "
-"matches at least one --match pattern and does not match any of the --exclude "
-"patterns. Use `--no-exclude` to clear and reset the list of patterns."
+#, priority:260
+msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--always"
msgstr "--always"
#. type: Plain text
#: en/git-describe.txt:120 en/git-name-rev.txt:63
-#, fuzzy
+#, fuzzy, priority:260
msgid "Show uniquely abbreviated commit object as fallback."
msgstr "mostrar el objeto commit abreviado como fallback"
#. type: Labeled list
#: en/git-describe.txt:121 en/rev-list-options.txt:124
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--first-parent"
msgstr "--first-parent"
#. type: Plain text
#: en/git-describe.txt:125
-msgid ""
-"Follow only the first parent commit upon seeing a merge commit. This is "
-"useful when you wish to not match tags on branches merged in the history of "
-"the target commit."
+#, priority:260
+msgid "Follow only the first parent commit upon seeing a merge commit. This is useful when you wish to not match tags on branches merged in the history of the target commit."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:130
+#, priority:260
msgid "With something like git.git current tree, I get:"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:133
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t[torvalds@g5 git]$ git describe parent\n"
"\tv1.0.4-14-g2414721\n"
@@ -21495,33 +18559,25 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:139
-msgid ""
-"i.e. the current head of my \"parent\" branch is based on v1.0.4, but since "
-"it has a few commits on top of that, describe has added the number of "
-"additional commits (\"14\") and an abbreviated object name for the commit "
-"itself (\"2414721\") at the end."
+#, priority:260
+msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\") at the end."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:147
-msgid ""
-"The number of additional commits is the number of commits which would be "
-"displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + "
-"unambiguous abbreviation for the tip commit of parent (which was "
-"`2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for "
-"\"git\" and is used to allow describing the version of a software depending "
-"on the SCM the software is managed with. This is useful in an environment "
-"where people may use different SCMs."
+#, priority:260
+msgid "The number of additional commits is the number of commits which would be displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + unambiguous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for \"git\" and is used to allow describing the version of a software depending on the SCM the software is managed with. This is useful in an environment where people may use different SCMs."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:149
+#, priority:260
msgid "Doing a 'git describe' on a tag-name will just show the tag name:"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:152
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t[torvalds@g5 git]$ git describe v1.0.4\n"
"\tv1.0.4\n"
@@ -21529,14 +18585,13 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:155
-msgid ""
-"With --all, the command can use branch heads as references, so the output "
-"shows the reference path as well:"
+#, priority:260
+msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:158
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
"\ttags/v1.0.0-21-g975b\n"
@@ -21544,7 +18599,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:161
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
"\theads/lt/describe-7-g975b\n"
@@ -21552,14 +18607,13 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:164
-msgid ""
-"With --abbrev set to 0, the command can be used to find the closest tagname "
-"without any suffix:"
+#, priority:260
+msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:167
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
"\ttags/v1.0.0\n"
@@ -21567,217 +18621,181 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:173
-msgid ""
-"Note that the suffix you get if you type these commands today may be longer "
-"than what Linus saw above when he ran these commands, as your Git repository "
-"may have new commits whose object names begin with 975b that did not exist "
-"back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate "
-"these commits."
+#, priority:260
+msgid "Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your Git repository may have new commits whose object names begin with 975b that did not exist back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate these commits."
msgstr ""
#. type: Title -
#: en/git-describe.txt:176
-#, no-wrap
+#, no-wrap, priority:260
msgid "SEARCH STRATEGY"
msgstr ""
#. type: Plain text
#: en/git-describe.txt:183
-msgid ""
-"For each commit-ish supplied, 'git describe' will first look for a tag which "
-"tags exactly that commit. Annotated tags will always be preferred over "
-"lightweight tags, and tags with newer dates will always be preferred over "
-"tags with older dates. If an exact match is found, its name will be output "
-"and searching will stop."
+#, priority:260
+msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit. Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates. If an exact match is found, its name will be output and searching will stop."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:190
-msgid ""
-"If an exact match was not found, 'git describe' will walk back through the "
-"commit history to locate an ancestor commit which has been tagged. The "
-"ancestor's tag will be output along with an abbreviation of the input "
-"commit-ish's SHA-1. If `--first-parent` was specified then the walk will "
-"only consider the first parent of each commit."
+#, priority:260
+msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:196
-msgid ""
-"If multiple tags were found during the walk then the tag which has the "
-"fewest commits different from the input commit-ish will be selected and "
-"output. Here fewest commits different is defined as the number of commits "
-"which would be shown by `git log tag..input` will be the smallest number of "
-"commits possible."
+#, priority:260
+msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:204
-msgid ""
-"Tree objects as well as tag objects not pointing at commits, cannot be "
-"described. When describing blobs, the lightweight tags pointing at blobs "
-"are ignored, but the blob is still described as <committ-ish>:<path> despite "
-"the lightweight tag being favorable."
+#, priority:260
+msgid "Tree objects as well as tag objects not pointing at commits, cannot be described. When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-diff-files(1)"
msgstr "git-diff-files(1)"
#. type: Plain text
#: en/git-diff-files.txt:7
+#, priority:100
msgid "git-diff-files - Compares files in the working tree and the index"
msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:13
-#, no-wrap
-msgid ""
-"'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] "
-"[<path>...]\n"
+#, ignore-ellipsis, no-wrap, priority:100
+msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:20
-msgid ""
-"Compares the files in the working tree and the index. When paths are "
-"specified, compares only those named paths. Otherwise all entries in the "
-"index are compared. The output format is the same as for 'git diff-index' "
-"and 'git diff-tree'."
+#, priority:100
+msgid "Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the same as for 'git diff-index' and 'git diff-tree'."
msgstr ""
#. type: Labeled list
#: en/git-diff-files.txt:25 en/git-diff.txt:100
-#, no-wrap
+#, no-wrap, priority:280
msgid "-1 --base"
msgstr ""
#. type: Labeled list
#: en/git-diff-files.txt:26 en/git-diff.txt:101
-#, no-wrap
+#, no-wrap, priority:280
msgid "-2 --ours"
msgstr ""
#. type: Labeled list
#: en/git-diff-files.txt:27 en/git-diff.txt:102
-#, no-wrap
+#, no-wrap, priority:280
msgid "-3 --theirs"
msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:32
-msgid ""
-"Diff against the \"base\" version, \"our branch\" or \"their branch\" "
-"respectively. With these options, diffs for merged entries are not shown."
+#, priority:100
+msgid "Diff against the \"base\" version, \"our branch\" or \"their branch\" respectively. With these options, diffs for merged entries are not shown."
msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:36
-msgid ""
-"The default is to diff against our branch (-2) and the cleanly resolved "
-"paths. The option -0 can be given to omit diff output for unmerged entries "
-"and just show \"Unmerged\"."
+#, priority:100
+msgid "The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show \"Unmerged\"."
msgstr ""
#. type: Labeled list
#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1002
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
#. type: Plain text
#: en/git-diff-files.txt:43
-msgid ""
-"This compares stage 2 (our branch), stage 3 (their branch) and the working "
-"tree file and outputs a combined diff, similar to the way 'diff-tree' shows "
-"a merge commit with these flags."
+#, priority:100
+msgid "This compares stage 2 (our branch), stage 3 (their branch) and the working tree file and outputs a combined diff, similar to the way 'diff-tree' shows a merge commit with these flags."
msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:46
+#, priority:100
msgid "Remain silent even on nonexistent files"
msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-diff-index(1)"
msgstr "git-diff-index(1)"
#. type: Plain text
#: en/git-diff-index.txt:7
+#, priority:100
msgid "git-diff-index - Compare a tree to the working tree or index"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:13
-#, no-wrap
-msgid ""
-"'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> "
-"[<path>...]\n"
+#, ignore-ellipsis, no-wrap, priority:100
+msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:21
-msgid ""
-"Compares the content and mode of the blobs found in a tree object with the "
-"corresponding tracked files in the working tree, or with the corresponding "
-"paths in the index. When <path> arguments are present, compares only paths "
-"matching those patterns. Otherwise all tracked files are compared."
+#, priority:100
+msgid "Compares the content and mode of the blobs found in a tree object with the corresponding tracked files in the working tree, or with the corresponding paths in the index. When <path> arguments are present, compares only paths matching those patterns. Otherwise all tracked files are compared."
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:28
+#, priority:100
msgid "The id of a tree object to diff against."
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:31
+#, priority:100
msgid "do not consider the on-disk file at all"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:37
-msgid ""
-"By default, files recorded in the index but not checked out are reported as "
-"deleted. This flag makes 'git diff-index' say that all non-checked-out "
-"files are up to date."
+#, priority:100
+msgid "By default, files recorded in the index but not checked out are reported as deleted. This flag makes 'git diff-index' say that all non-checked-out files are up to date."
msgstr ""
#. type: Title -
#: en/git-diff-index.txt:41
-#, no-wrap
+#, no-wrap, priority:100
msgid "OPERATING MODES"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:46
-msgid ""
-"You can choose whether you want to trust the index file entirely (using the "
-"`--cached` flag) or ask the diff logic to show any files that don't match "
-"the stat state as being \"tentatively changed\". Both of these operations "
-"are very useful indeed."
+#, priority:100
+msgid "You can choose whether you want to trust the index file entirely (using the `--cached` flag) or ask the diff logic to show any files that don't match the stat state as being \"tentatively changed\". Both of these operations are very useful indeed."
msgstr ""
#. type: Title -
#: en/git-diff-index.txt:48
-#, no-wrap
+#, no-wrap, priority:100
msgid "CACHED MODE"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:50
+#, priority:100
msgid "If `--cached` is specified, it allows you to ask:"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:53
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tshow me the differences between HEAD and the current index\n"
"\tcontents (the ones I'd write using 'git write-tree')\n"
@@ -21785,77 +18803,64 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:58
-msgid ""
-"For example, let's say that you have worked on your working directory, "
-"updated some files in the index and are ready to commit. You want to see "
-"exactly *what* you are going to commit, without having to write a new tree "
-"object and compare it that way, and to do that, you just do"
+#, priority:100
+msgid "For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly *what* you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:60
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit diff-index --cached HEAD\n"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:65
-msgid ""
-"Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had "
-"done an `update-index` to make that effective in the index file. `git "
-"diff-files` wouldn't show anything at all, since the index file matches my "
-"working directory. But doing a 'git diff-index' does:"
+#, priority:100
+msgid "Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had done an `update-index` to make that effective in the index file. `git diff-files` wouldn't show anything at all, since the index file matches my working directory. But doing a 'git diff-index' does:"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:69
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" torvalds@ppc970:~/git> git diff-index --cached HEAD\n"
" -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c\n"
-" +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 "
-"git-commit.c\n"
+" +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c\n"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:71
+#, priority:100
msgid "You can see easily that the above is a rename."
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:75
-msgid ""
-"In fact, `git diff-index --cached` *should* always be entirely equivalent to "
-"actually doing a 'git write-tree' and comparing that. Except this one is "
-"much nicer for the case where you just want to check where you are."
+#, priority:100
+msgid "In fact, `git diff-index --cached` *should* always be entirely equivalent to actually doing a 'git write-tree' and comparing that. Except this one is much nicer for the case where you just want to check where you are."
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:79
-msgid ""
-"So doing a `git diff-index --cached` is basically very useful when you are "
-"asking yourself \"what have I already marked for being committed, and what's "
-"the difference to a previous tree\"."
+#, priority:100
+msgid "So doing a `git diff-index --cached` is basically very useful when you are asking yourself \"what have I already marked for being committed, and what's the difference to a previous tree\"."
msgstr ""
#. type: Title -
#: en/git-diff-index.txt:81
-#, no-wrap
+#, no-wrap, priority:100
msgid "NON-CACHED MODE"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:86
-msgid ""
-"The \"non-cached\" mode takes a different approach, and is potentially the "
-"more useful of the two in that what it does can't be emulated with a 'git "
-"write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached "
-"version asks the question:"
+#, priority:100
+msgid "The \"non-cached\" mode takes a different approach, and is potentially the more useful of the two in that what it does can't be emulated with a 'git write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached version asks the question:"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:89
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" show me the differences between HEAD and the currently checked out\n"
" tree - index contents _and_ files that aren't up to date\n"
@@ -21863,25 +18868,19 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:93
-msgid ""
-"which is obviously a very useful question too, since that tells you what you "
-"*could* commit. Again, the output matches the 'git diff-tree -r' output to a "
-"tee, but with a twist."
+#, priority:100
+msgid "which is obviously a very useful question too, since that tells you what you *could* commit. Again, the output matches the 'git diff-tree -r' output to a tee, but with a twist."
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:99
-msgid ""
-"The twist is that if some file doesn't match the index, we don't have a "
-"backing store thing for it, and we use the magic \"all-zero\" sha1 to show "
-"that. So let's say that you have edited `kernel/sched.c`, but have not "
-"actually done a 'git update-index' on it yet - there is no \"object\" "
-"associated with the new state, and you get:"
+#, priority:100
+msgid "The twist is that if some file doesn't match the index, we don't have a backing store thing for it, and we use the magic \"all-zero\" sha1 to show that. So let's say that you have edited `kernel/sched.c`, but have not actually done a 'git update-index' on it yet - there is no \"object\" associated with the new state, and you get:"
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:102
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD\n"
" :100644 100664 7476bb... 000000... kernel/sched.c\n"
@@ -21889,406 +18888,349 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:107
-msgid ""
-"i.e., it shows that the tree has changed, and that `kernel/sched.c` is not "
-"up to date and may contain new stuff. The all-zero sha1 means that to get "
-"the real diff, you need to look at the object in the working directory "
-"directly rather than do an object-to-object diff."
+#, priority:100
+msgid "i.e., it shows that the tree has changed, and that `kernel/sched.c` is not up to date and may contain new stuff. The all-zero sha1 means that to get the real diff, you need to look at the object in the working directory directly rather than do an object-to-object diff."
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:113
-msgid ""
-"As with other commands of this type, 'git diff-index' does not actually look "
-"at the contents of the file at all. So maybe `kernel/sched.c` hasn't "
-"actually changed, and it's just that you touched it. In either case, it's a "
-"note that you need to 'git update-index' it to make the index be in sync."
+#, priority:100
+msgid "As with other commands of this type, 'git diff-index' does not actually look at the contents of the file at all. So maybe `kernel/sched.c` hasn't actually changed, and it's just that you touched it. In either case, it's a note that you need to 'git update-index' it to make the index be in sync."
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:119
-msgid ""
-"You can have a mixture of files show up as \"has been updated\" and \"is "
-"still dirty in the working directory\" together. You can always tell which "
-"file is in which state, since the \"has been updated\" ones show a valid "
-"sha1, and the \"not in sync with the index\" ones will always have the "
-"special all-zero sha1."
+#, priority:100
+msgid "You can have a mixture of files show up as \"has been updated\" and \"is still dirty in the working directory\" together. You can always tell which file is in which state, since the \"has been updated\" ones show a valid sha1, and the \"not in sync with the index\" ones will always have the special all-zero sha1."
msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-difftool(1)"
msgstr "git-difftool(1)"
#. type: Plain text
#: en/git-difftool.txt:7
+#, priority:100
msgid "git-difftool - Show changes using common diff tools"
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:12
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
#. type: Plain text
#: en/git-difftool.txt:19
-msgid ""
-"'git difftool' is a Git command that allows you to compare and edit files "
-"between revisions using common diff tools. 'git difftool' is a frontend to "
-"'git diff' and accepts the same options and arguments. See "
-"linkgit:git-diff[1]."
+#, priority:100
+msgid "'git difftool' is a Git command that allows you to compare and edit files between revisions using common diff tools. 'git difftool' is a frontend to 'git diff' and accepts the same options and arguments. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--dir-diff"
msgstr "--dir-diff"
#. type: Plain text
#: en/git-difftool.txt:27
-msgid ""
-"Copy the modified files to a temporary location and perform a directory diff "
-"on them. This mode never prompts before launching the diff tool."
+#, priority:100
+msgid "Copy the modified files to a temporary location and perform a directory diff on them. This mode never prompts before launching the diff tool."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "-y"
msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-prompt"
msgstr "--no-prompt"
#. type: Plain text
#: en/git-difftool.txt:31
-#, fuzzy
+#, fuzzy, priority:100
msgid "Do not prompt before launching a diff tool."
msgstr "no mostrar antes de lanzar una herramienta de diff"
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--prompt"
msgstr "--prompt"
#. type: Plain text
#: en/git-difftool.txt:36
-msgid ""
-"Prompt before each invocation of the diff tool. This is the default "
-"behaviour; the option is provided to override any configuration settings."
+#, priority:100
+msgid "Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration settings."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:37 en/git-mergetool.txt:27
-#, no-wrap
+#, no-wrap, priority:240
msgid "-t <tool>"
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:38 en/git-mergetool.txt:28
-#, no-wrap
+#, no-wrap, priority:240
msgid "--tool=<tool>"
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:42
-msgid ""
-"Use the diff tool specified by <tool>. Valid values include emerge, "
-"kompare, meld, and vimdiff. Run `git difftool --tool-help` for the list of "
-"valid <tool> settings."
+#, priority:100
+msgid "Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help` for the list of valid <tool> settings."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:47
-msgid ""
-"If a diff tool is not specified, 'git difftool' will use the configuration "
-"variable `diff.tool`. If the configuration variable `diff.tool` is not set, "
-"'git difftool' will pick a suitable default."
+#, priority:100
+msgid "If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the configuration variable `diff.tool` is not set, 'git difftool' will pick a suitable default."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:53
-msgid ""
-"You can explicitly provide a full path to the tool by setting the "
-"configuration variable `difftool.<tool>.path`. For example, you can "
-"configure the absolute path to kdiff3 by setting "
-"`difftool.kdiff3.path`. Otherwise, 'git difftool' assumes the tool is "
-"available in PATH."
+#, priority:100
+msgid "You can explicitly provide a full path to the tool by setting the configuration variable `difftool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `difftool.kdiff3.path`. Otherwise, 'git difftool' assumes the tool is available in PATH."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:58
-msgid ""
-"Instead of running one of the known diff tools, 'git difftool' can be "
-"customized to run an alternative program by specifying the command line to "
-"invoke in a configuration variable `difftool.<tool>.cmd`."
+#, priority:100
+msgid "Instead of running one of the known diff tools, 'git difftool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `difftool.<tool>.cmd`."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:68
-msgid ""
-"When 'git difftool' is invoked with this tool (either through the `-t` or "
-"`--tool` option or the `diff.tool` configuration variable) the configured "
-"command line will be invoked with the following variables available: "
-"`$LOCAL` is set to the name of the temporary file containing the contents of "
-"the diff pre-image and `$REMOTE` is set to the name of the temporary file "
-"containing the contents of the diff post-image. `$MERGED` is the name of "
-"the file which is being compared. `$BASE` is provided for compatibility with "
-"custom merge tool commands and has the same value as `$MERGED`."
+#, priority:100
+msgid "When 'git difftool' is invoked with this tool (either through the `-t` or `--tool` option or the `diff.tool` configuration variable) the configured command line will be invoked with the following variables available: `$LOCAL` is set to the name of the temporary file containing the contents of the diff pre-image and `$REMOTE` is set to the name of the temporary file containing the contents of the diff post-image. `$MERGED` is the name of the file which is being compared. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$MERGED`."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--tool-help"
msgstr "--tool-help"
#. type: Plain text
#: en/git-difftool.txt:71
-#, fuzzy
+#, fuzzy, priority:100
msgid "Print a list of diff tools that may be used with `--tool`."
-msgstr ""
-"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
+msgstr "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
#. type: Labeled list
#: en/git-difftool.txt:72
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]symlinks"
msgstr "--[no-]symlinks"
#. type: Plain text
#: en/git-difftool.txt:77
-msgid ""
-"'git difftool''s default behavior is create symlinks to the working tree "
-"when run in `--dir-diff` mode and the right-hand side of the comparison "
-"yields the same content as the file in the working tree."
+#, priority:100
+msgid "'git difftool''s default behavior is create symlinks to the working tree when run in `--dir-diff` mode and the right-hand side of the comparison yields the same content as the file in the working tree."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:80
-msgid ""
-"Specifying `--no-symlinks` instructs 'git difftool' to create copies "
-"instead. `--no-symlinks` is the default on Windows."
+#, priority:100
+msgid "Specifying `--no-symlinks` instructs 'git difftool' to create copies instead. `--no-symlinks` is the default on Windows."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:81
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "-x <command>"
msgstr "<comando>"
#. type: Labeled list
#: en/git-difftool.txt:82
-#, no-wrap
+#, no-wrap, priority:100
msgid "--extcmd=<command>"
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:87
-msgid ""
-"Specify a custom command for viewing diffs. 'git-difftool' ignores the "
-"configured defaults and runs `$command $LOCAL $REMOTE` when this option is "
-"specified. Additionally, `$BASE` is set in the environment."
+#, priority:100
+msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the configured defaults and runs `$command $LOCAL $REMOTE` when this option is specified. Additionally, `$BASE` is set in the environment."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:264
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "-g"
msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]gui"
msgstr "--[no-]gui"
#. type: Plain text
#: en/git-difftool.txt:96
-msgid ""
-"When 'git-difftool' is invoked with the `-g` or `--gui` option the default "
-"diff tool will be read from the configured `diff.guitool` variable instead "
-"of `diff.tool`. The `--no-gui` option can be used to override this "
-"setting. If `diff.guitool` is not set, we will fallback in the order of "
-"`merge.guitool`, `diff.tool`, `merge.tool` until a tool is found."
+#, priority:100
+msgid "When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. The `--no-gui` option can be used to override this setting. If `diff.guitool` is not set, we will fallback in the order of `merge.guitool`, `diff.tool`, `merge.tool` until a tool is found."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:97
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
#. type: Plain text
#: en/git-difftool.txt:102
-msgid ""
-"'git-difftool' invokes a diff tool individually on each file. Errors "
-"reported by the diff tool are ignored by default. Use `--trust-exit-code` "
-"to make 'git-difftool' exit when an invoked diff tool returns a non-zero "
-"exit code."
+#, priority:100
+msgid "'git-difftool' invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:105
-msgid ""
-"'git-difftool' will forward the exit code of the invoked tool when "
-"`--trust-exit-code` is used."
+#, priority:100
+msgid "'git-difftool' will forward the exit code of the invoked tool when `--trust-exit-code` is used."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:107
+#, priority:100
msgid "See linkgit:git-diff[1] for the full list of supported options."
msgstr ""
#. type: Title -
#: en/git-difftool.txt:109
-#, no-wrap
+#, no-wrap, priority:100
msgid "CONFIG VARIABLES"
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:112
-msgid ""
-"'git difftool' falls back to 'git mergetool' config variables when the "
-"difftool equivalents have not been defined."
+#, priority:100
+msgid "'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:113
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "diff.tool"
msgstr "diff.tool"
#. type: Plain text
#: en/git-difftool.txt:115
+#, priority:100
msgid "The default diff tool to use."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:116
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "diff.guitool"
msgstr "diff.guitool"
#. type: Plain text
#: en/git-difftool.txt:118
+#, priority:100
msgid "The default diff tool to use when `--gui` is specified."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:119
-#, no-wrap
+#, no-wrap, priority:100
msgid "difftool.<tool>.path"
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:122
-msgid ""
-"Override the path for the given tool. This is useful in case your tool is "
-"not in the PATH."
+#, priority:100
+msgid "Override the path for the given tool. This is useful in case your tool is not in the PATH."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:123
-#, no-wrap
+#, no-wrap, priority:100
msgid "difftool.<tool>.cmd"
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:125
+#, priority:100
msgid "Specify the command to invoke the specified diff tool."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:127
+#, priority:100
msgid "See the `--tool=<tool>` option above for more details."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:128
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "difftool.prompt"
msgstr "difftool.prompt"
#. type: Plain text
#: en/git-difftool.txt:130
+#, priority:100
msgid "Prompt before each invocation of the diff tool."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:131
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "difftool.trustExitCode"
msgstr "difftool.trustExitCode"
#. type: Plain text
#: en/git-difftool.txt:133
+#, priority:100
msgid "Exit difftool if the invoked diff tool returns a non-zero exit status."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:135
+#, priority:100
msgid "See the `--trust-exit-code` option above for more details."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:140
+#, priority:100
msgid "Show changes between commits, commit and working tree, etc"
msgstr "Muestra los cambios entre commits, commit y 찼rbol de trabajo, etc"
#. type: Plain text
#: en/git-difftool.txt:143
+#, priority:100
msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
-"Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver "
-"conflictos de fusi처n"
+msgstr "Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver conflictos de fusi처n"
#. type: Plain text
#: en/git-difftool.txt:146
+#, priority:100
msgid "Get and set repository or global options"
msgstr "Configurar repositorio u opciones globales"
#. type: Title =
#: en/git-diff-tree.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, fuzzy
-msgid ""
-"git-diff-tree - Compares the content and mode of blobs found via two tree "
-"objects"
-msgstr ""
-"Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos "
-"de 찼rbol"
+#, fuzzy, priority:100
+msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
+msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol"
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]\n"
@@ -22297,193 +19239,157 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, fuzzy
+#, fuzzy, priority:100
msgid "Compares the content and mode of the blobs found via two tree objects."
-msgstr ""
-"Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos "
-"de 찼rbol"
+msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol"
#. type: Plain text
#: en/git-diff-tree.txt:22
-msgid ""
-"If there is only one <tree-ish> given, the commit is compared with its "
-"parents (see --stdin below)."
+#, priority:100
+msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
+#, priority:100
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
+#, priority:100
msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
-#, no-wrap
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-msgid ""
-"If provided, the results are limited to a subset of files matching one of "
-"the provided pathspecs."
+#, priority:100
+msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, fuzzy
+#, fuzzy, priority:100
msgid "recurse into sub-trees"
msgstr "recurrir en sub찼rboles"
#. type: Plain text
#: en/git-diff-tree.txt:41
+#, priority:100
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-msgid ""
-"When `--root` is specified the initial commit will be shown as a big "
-"creation event. This is equivalent to a diff against the NULL tree."
+#, priority:100
+msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:52
-msgid ""
-"When `--stdin` is specified, the command does not take <tree-ish> arguments "
-"from the command line. Instead, it reads lines containing either two "
-"<tree>, one <commit>, or a list of <commit> from its standard input. (Use a "
-"single space as separator.)"
+#, priority:100
+msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-msgid ""
-"When two trees are given, it compares the first tree with the second. When "
-"a single commit is given, it compares the commit with its parents. The "
-"remaining commits, when given, are used as if they are parents of the first "
-"commit."
+#, priority:100
+msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-msgid ""
-"When comparing two trees, the ID of both trees (separated by a space and "
-"terminated by a newline) is printed before the difference. When comparing "
-"commits, the ID of the first (or only) commit, followed by a newline, is "
-"printed."
+#, priority:100
+msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:65
-msgid ""
-"The following flags further affect the behavior when comparing commits (but "
-"not trees)."
+#, priority:100
+msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:71
-msgid ""
-"By default, 'git diff-tree --stdin' does not show differences for merge "
-"commits. With this flag, it shows differences to that commit from all of "
-"its parents. See also `-c`."
+#, priority:100
+msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:77
-msgid ""
-"By default, 'git diff-tree --stdin' shows differences, either in "
-"machine-readable form (without `-p`) or in patch form (with `-p`). This "
-"output can be suppressed. It is only useful with `-v` flag."
+#, priority:100
+msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:81
-msgid ""
-"This flag causes 'git diff-tree --stdin' to also show the commit message "
-"before the differences."
+#, priority:100
+msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:84
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:87
-msgid ""
-"'git diff-tree' outputs a line with the commit ID when applicable. This "
-"flag suppressed the commit ID output."
+#, priority:100
+msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:97
-msgid ""
-"This flag changes the way a merge commit is displayed (which means it is "
-"useful only when the command is given one <tree-ish>, or `--stdin`). It "
-"shows the differences from each of the parents to the merge result "
-"simultaneously instead of showing pairwise diff between a parent and the "
-"result one at a time (which is what the `-m` option does). Furthermore, it "
-"lists only files which were modified from all parents."
+#, priority:100
+msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:107
-msgid ""
-"This flag changes the way a merge commit patch is displayed, in a similar "
-"way to the `-c` option. It implies the `-c` and `-p` options and further "
-"compresses the patch output by omitting uninteresting hunks whose the "
-"contents in the parents have only two variants and the merge result picks "
-"one of them without modification. When all hunks are uninteresting, the "
-"commit itself and the commit log message is not shown, just like in any "
-"other \"empty diff\" case."
+#, priority:100
+msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1008
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1014
-msgid ""
-"This flag causes combined diffs (used for merge commits) to list the name of "
-"the file from all parents. It thus only has effect when -c or --cc are "
-"specified, and is likely only useful if filename changes are detected "
-"(i.e. when either rename or copy detection have been requested)."
+#, priority:260
+msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:118
-msgid ""
-"Show the commit itself and the commit log message even if the diff itself is "
-"empty."
+#, priority:100
+msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "git-diff(1)"
msgstr "git-diff(1)"
#. type: Plain text
#: en/git-diff.txt:7
-#, fuzzy
+#, fuzzy, priority:280
msgid "git-diff - Show changes between commits, commit and working tree, etc"
msgstr "Muestra los cambios entre commits, commit y 찼rbol de trabajo, etc"
#. type: Plain text
#: en/git-diff.txt:17
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git diff' [<options>] [<commit>] [--] [<path>...]\n"
"'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
@@ -22494,175 +19400,145 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:23
-msgid ""
-"Show changes between the working tree and the index or a tree, changes "
-"between the index and a tree, changes between two trees, changes between two "
-"blob objects, or changes between two files on disk."
+#, priority:280
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:24
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] [--] [<path>...]"
msgstr ""
#. type: Plain text
#: en/git-diff.txt:31
-msgid ""
-"This form is to view the changes you made relative to the index (staging "
-"area for the next commit). In other words, the differences are what you "
-"_could_ tell Git to further add to the index but you still haven't. You can "
-"stage these changes by using linkgit:git-add[1]."
+#, priority:280
+msgid "This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:32
-#, no-wrap
+#, no-wrap, priority:280
msgid "'git diff' [<options>] --no-index [--] <path> <path>"
msgstr ""
#. type: Plain text
#: en/git-diff.txt:40
-msgid ""
-"This form is to compare the given two paths on the filesystem. You can omit "
-"the `--no-index` option when running the command in a working tree "
-"controlled by Git and at least one of the paths points outside the working "
-"tree, or when running the command outside a working tree controlled by "
-"Git. This form implies `--exit-code`."
+#, priority:280
+msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:41
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
#. type: Plain text
#: en/git-diff.txt:50
-msgid ""
-"This form is to view the changes you staged for the next commit relative to "
-"the named <commit>. Typically you would want comparison with the latest "
-"commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does "
-"not exist (e.g. unborn branches) and <commit> is not given, it shows all "
-"staged changes. --staged is a synonym of --cached."
+#, priority:280
+msgid "This form is to view the changes you staged for the next commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes. --staged is a synonym of --cached."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:51
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
#: en/git-diff.txt:58
-msgid ""
-"This form is to view the changes you have in your working tree relative to "
-"the named <commit>. You can use HEAD to compare it with the latest commit, "
-"or a branch name to compare with the tip of a different branch."
+#, priority:280
+msgid "This form is to view the changes you have in your working tree relative to the named <commit>. You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:59
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
#. type: Plain text
#: en/git-diff.txt:63
+#, priority:280
msgid "This is to view the changes between two arbitrary <commit>."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:64
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
#. type: Plain text
#: en/git-diff.txt:69
-msgid ""
-"This is synonymous to the previous form. If <commit> on one side is "
-"omitted, it will have the same effect as using HEAD instead."
+#, priority:280
+msgid "This is synonymous to the previous form. If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:70
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
#. type: Plain text
#: en/git-diff.txt:77
-msgid ""
-"This form is to view the changes on the branch containing and up to the "
-"second <commit>, starting at a common ancestor of both <commit>. \"git diff "
-"A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\". You can "
-"omit any one of <commit>, which has the same effect as using HEAD instead."
+#, ignore-ellipsis, priority:280
+msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\". You can omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:82
-msgid ""
-"Just in case you are doing something exotic, it should be noted that all of "
-"the <commit> in the above description, except in the last two forms that use "
-"\"..\" notations, can be any <tree>."
+#, priority:280
+msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:89
-msgid ""
-"For a more complete list of ways to spell <commit>, see \"SPECIFYING "
-"REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about "
-"comparing two _endpoints_, not ranges, and the range notations "
-"(\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range "
-"as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
+#, ignore-ellipsis, priority:280
+msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:90
-#, no-wrap
+#, no-wrap, priority:280
msgid "'git diff' [<options>] <blob> <blob>"
msgstr ""
#. type: Plain text
#: en/git-diff.txt:94
-msgid ""
-"This form is to view the differences between the raw contents of two blob "
-"objects."
+#, priority:280
+msgid "This form is to view the differences between the raw contents of two blob objects."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:108
-msgid ""
-"Compare the working tree with the \"base\" version (stage #1), \"our "
-"branch\" (stage #2) or \"their branch\" (stage #3). The index contains "
-"these stages only for unmerged entries i.e. while resolving conflicts. See "
-"linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
+#, priority:280
+msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3). The index contains these stages only for unmerged entries i.e. while resolving conflicts. See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:113
-msgid ""
-"Omit diff output for unmerged entries and just show \"Unmerged\". Can be "
-"used only when comparing the working tree with the index."
+#, priority:280
+msgid "Omit diff output for unmerged entries and just show \"Unmerged\". Can be used only when comparing the working tree with the index."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:118
-msgid ""
-"The <paths> parameters, when given, are used to limit the diff to the named "
-"paths (you can give directory names and get diff for all files under them)."
+#, priority:280
+msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:125
-#, no-wrap
+#, no-wrap, priority:280
msgid "Various ways to check your working tree"
msgstr ""
#. type: delimited block -
#: en/git-diff.txt:131
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"$ git diff <1>\n"
"$ git diff --cached <2>\n"
@@ -22671,32 +19547,31 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:134
+#, priority:280
msgid "Changes in the working tree not yet staged for the next commit."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:136
-msgid ""
-"Changes between the index and your last commit; what you would be committing "
-"if you run \"git commit\" without \"-a\" option."
+#, priority:280
+msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:138
-msgid ""
-"Changes in the working tree since your last commit; what you would be "
-"committing if you run \"git commit -a\""
+#, priority:280
+msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:139
-#, no-wrap
+#, no-wrap, priority:280
msgid "Comparing with arbitrary commits"
msgstr ""
#. type: delimited block -
#: en/git-diff.txt:145
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"$ git diff test <1>\n"
"$ git diff HEAD -- ./test <2>\n"
@@ -22705,32 +19580,31 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:149
-msgid ""
-"Instead of using the tip of the current branch, compare with the tip of "
-"\"test\" branch."
+#, priority:280
+msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:152
-msgid ""
-"Instead of comparing with the tip of \"test\" branch, compare with the tip "
-"of the current branch, but limit the comparison to the file \"test\"."
+#, priority:280
+msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:153
+#, priority:280
msgid "Compare the version before the last commit and the last commit."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:154
-#, no-wrap
+#, no-wrap, priority:280
msgid "Comparing branches"
msgstr ""
#. type: delimited block -
#: en/git-diff.txt:160
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git diff topic master <1>\n"
"$ git diff topic..master <2>\n"
@@ -22739,30 +19613,31 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:163
+#, priority:280
msgid "Changes between the tips of the topic and the master branches."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#, priority:280
msgid "Same as above."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:166
-msgid ""
-"Changes that occurred on the master branch since when the topic branch was "
-"started off it."
+#, priority:280
+msgid "Changes that occurred on the master branch since when the topic branch was started off it."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:167
-#, no-wrap
+#, no-wrap, priority:280
msgid "Limiting the diff output"
msgstr ""
#. type: delimited block -
#: en/git-diff.txt:173
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"$ git diff --diff-filter=MRC <1>\n"
"$ git diff --name-status <2>\n"
@@ -22771,28 +19646,31 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:177
+#, priority:280
msgid "Show only modification, rename, and copy, but not addition or deletion."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:179
+#, priority:280
msgid "Show only names and the nature of change, but not actual diff output."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:180
+#, priority:280
msgid "Limit diff output to named subtrees."
msgstr ""
#. type: Labeled list
#: en/git-diff.txt:181
-#, no-wrap
+#, no-wrap, priority:280
msgid "Munging the diff output"
msgstr ""
#. type: delimited block -
#: en/git-diff.txt:186
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"$ git diff --find-copies-harder -B -C <1>\n"
"$ git diff -R <2>\n"
@@ -22800,367 +19678,289 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:190
-msgid ""
-"Spend extra cycles to find renames, copies and complete rewrites (very "
-"expensive)."
+#, priority:280
+msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:191
+#, priority:280
msgid "Output diff in reverse."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:200
-msgid ""
-"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
-"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+#, priority:280
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
+#, priority:100
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-msgid ""
-"This program dumps the given revisions in a form suitable to be piped into "
-"'git fast-import'."
+#, priority:100
+msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-msgid ""
-"You can use it as a human-readable bundle replacement (see "
-"linkgit:git-bundle[1]), or as a format that can be edited before being fed "
-"to 'git fast-import' in order to do history rewrites (an ability relied on "
-"by tools like 'git filter-repo')."
+#, priority:100
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap
+#, no-wrap, priority:100
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-msgid ""
-"Insert 'progress' statements every <n> objects, to be shown by 'git "
-"fast-import' during import."
+#, priority:100
+msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap
+#, no-wrap, priority:100
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-msgid ""
-"Specify how to handle signed tags. Since any transformation after the "
-"export can change the tag names (which can also happen when excluding "
-"revisions) the signatures will not match."
+#, priority:100
+msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-msgid ""
-"When asking to 'abort' (which is the default), this program will die when "
-"encountering a signed tag. With 'strip', the tags will silently be made "
-"unsigned, with 'warn-strip' they will be made unsigned but a warning will be "
-"displayed, with 'verbatim', they will be silently exported and with 'warn', "
-"they will be exported, but you will see a warning."
+#, priority:100
+msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap
+#, no-wrap, priority:100
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-msgid ""
-"Specify how to handle tags whose tagged object is filtered out. Since "
-"revisions and files to export can be limited by path, tagged objects may be "
-"filtered completely."
+#, priority:100
+msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-msgid ""
-"When asking to 'abort' (which is the default), this program will die when "
-"encountering such a tag. With 'drop' it will omit such tags from the "
-"output. With 'rewrite', if the tagged object is a commit, it will rewrite "
-"the tag to tag an ancestor commit (via parent rewriting; see "
-"linkgit:git-rev-list[1])"
+#, priority:100
+msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-msgid ""
-"Perform move and/or copy detection, as described in the linkgit:git-diff[1] "
-"manual page, and use it to generate rename and copy commands in the output "
-"dump."
+#, priority:100
+msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-msgid ""
-"Note that earlier versions of this command did not complain and produced "
-"incorrect results if you gave these options."
+#, priority:100
+msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap
+#, no-wrap, priority:100
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-msgid ""
-"Dumps the internal marks table to <file> when complete. Marks are written "
-"one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks "
-"for blobs are ignored. Backends can use this file to validate imports after "
-"they have been completed, or to save the marks table across incremental "
-"runs. As <file> is only opened and truncated at completion, the same path "
-"can also be safely given to --import-marks. The file will not be written if "
-"no new object has been marked/exported."
+#, priority:100
+msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap
+#, no-wrap, priority:100
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-msgid ""
-"Before processing any input, load the marks specified in <file>. The input "
-"file must exist, must be readable, and must use the same format as produced "
-"by --export-marks."
+#, priority:100
+msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-msgid ""
-"In addition to labelling blobs and commits with mark ids, also label tags. "
-"This is useful in conjunction with `--export-marks` and `--import-marks`, "
-"and is also useful (and necessary) for exporting of nested tags. It does "
-"not hurt other cases and would be the default, but many fast-import "
-"frontends are not prepared to accept tags with mark identifiers."
+#, priority:100
+msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-msgid ""
-"Any commits (or tags) that have already been marked will not be exported "
-"again. If the backend uses a similar --import-marks file, this allows for "
-"incremental bidirectional exporting of the repository by keeping the marks "
-"the same across runs."
+#, priority:100
+msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-msgid ""
-"Some old repositories have tags without a tagger. The fast-import protocol "
-"was pretty strict about that, and did not allow that. So fake a tagger to "
-"be able to fast-import the output."
+#, priority:100
+msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-msgid ""
-"Start the stream with a 'feature done' stanza, and terminate it with a "
-"'done' command."
+#, priority:100
+msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-msgid ""
-"Skip output of blob objects and instead refer to blobs via their original "
-"SHA-1 hash. This is useful when rewriting the directory structure or "
-"history of a repository without touching the contents of individual files. "
-"Note that the resulting stream can only be used by a repository which "
-"already contains the necessary objects."
+#, priority:100
+msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-msgid ""
-"This option will cause fast-export to issue a \"deleteall\" directive for "
-"each commit followed by a full list of all files in the commit (as opposed "
-"to just listing the files which are different from the commit's first "
-"parent)."
+#, priority:100
+msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-msgid ""
-"Anonymize the contents of the repository while still retaining the shape of "
-"the history and stored tree. See the section on `ANONYMIZING` below."
+#, priority:100
+msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:133
-msgid ""
-"By default, running a command such as `git fast-export master~5..master` "
-"will not include the commit master{tilde}5 and will make master{tilde}4 no "
-"longer have master{tilde}5 as a parent (though both the old master{tilde}4 "
-"and new master{tilde}4 will have all the same files). Use "
-"--reference-excluded-parents to instead have the stream refer to commits in "
-"the excluded range of history by their sha1sum. Note that the resulting "
-"stream can only be used by a repository which already contains the necessary "
-"parent commits."
+#, priority:100
+msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:134
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:140
-msgid ""
-"Add an extra directive to the output for commits and blobs, `original-oid "
-"<SHA1SUM>`. While such directives will likely be ignored by importers such "
-"as git-fast-import, it may be useful for intermediary filters (e.g. for "
-"rewriting commit messages which refer to older commits, or for stripping "
-"blobs by id)."
+#, priority:100
+msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:141
-#, no-wrap
+#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:147
-msgid ""
-"Specify how to handle `encoding` header in commit objects. When asking to "
-"'abort' (which is the default), this program will die when encountering such "
-"a commit object. With 'yes', the commit message will be re-encoded into "
-"UTF-8. With 'no', the original encoding will be preserved."
+#, priority:100
+msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:148
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:151
-msgid ""
-"Apply the specified refspec to each ref exported. Multiple of them can be "
-"specified."
+#, priority:100
+msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:152
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:160
-msgid ""
-"A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that "
-"specifies the specific objects and references to export. For example, "
-"`master~10..master` causes the current master reference to be exported along "
-"with all objects added since its 10th ancestor commit and (unless the "
-"--reference-excluded-parents option is specified) all files common to "
-"master{tilde}9 and master{tilde}10."
+#, priority:100
+msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:166
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:171
-msgid ""
-"This will export the whole repository and import it into the existing empty "
-"repository. Except for reencoding commits that are not in UTF-8, it would "
-"be a one-to-one mirror."
+#, priority:100
+msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:176
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -23169,75 +19969,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:180
-msgid ""
-"This makes a new branch called 'other' from 'master~5..master' (i.e. if "
-"'master' has linear history, it will take the last 5 commits)."
+#, priority:100
+msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:184
-msgid ""
-"Note that this assumes that none of the blobs and commit messages referenced "
-"by that revision range contains the string 'refs/heads/master'."
+#, priority:100
+msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:187
-#, no-wrap
+#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:195
-msgid ""
-"If the `--anonymize` option is given, git will attempt to remove all "
-"identifying information from the repository while still retaining enough of "
-"the original tree and history patterns to reproduce some bugs. The goal is "
-"that a git bug which is found on a private repository will persist in the "
-"anonymized repository, and the latter can be shared with git developers to "
-"help solve the bug."
+#, priority:100
+msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:207
-msgid ""
-"With this option, git will replace all refnames, paths, blob contents, "
-"commit and tag messages, names, and email addresses in the output with "
-"anonymized data. Two instances of the same string will be replaced "
-"equivalently (e.g., two commits with the same author will have the same "
-"anonymized author in the output, but bear no resemblance to the original "
-"author string). The relationship between commits, branches, and tags is "
-"retained, as well as the commit timestamps (but the commit messages and "
-"refnames bear no resemblance to the originals). The relative makeup of the "
-"tree is retained (e.g., if you have a root tree with 10 files and 3 trees, "
-"so will the output), but their names and the contents of the files will be "
-"replaced."
+#, priority:100
+msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:210
-msgid ""
-"If you think you have found a git bug, you can start by exporting an "
-"anonymized stream of the whole repository:"
+#, priority:100
+msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:213
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:218
-msgid ""
-"Then confirm that the bug persists in a repository created from that stream "
-"(many bugs will not, as they really do depend on the exact repository "
-"contents):"
+#, priority:100
+msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:224
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -23247,860 +20027,673 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:231
-msgid ""
-"If the anonymized repository shows the bug, it may be worth sharing "
-"`anon-stream` along with a regular bug report. Note that the anonymized "
-"stream compresses very well, so gzipping it is encouraged. If you want to "
-"examine the stream to see that it does not contain any private data, you can "
-"peruse it directly before sending. You may also want to try:"
+#, priority:100
+msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:234
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:240
-msgid ""
-"which shows all of the unique lines (with numbers converted to \"X\", to "
-"collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much "
-"smaller output, and it is usually easy to quickly confirm that there is no "
-"private data in the stream."
+#, priority:100
+msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:248
-msgid ""
-"Since 'git fast-import' cannot tag trees, you will not be able to export the "
-"linux.git repository completely, as it contains a tag referencing a tree "
-"instead of a commit."
+#, priority:100
+msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
+#, priority:100
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-msgid ""
-"This program is usually not what the end user wants to run directly. Most "
-"end users want to use one of the existing frontend programs, which parses a "
-"specific type of foreign source and feeds the contents stored there to 'git "
-"fast-import'."
+#, priority:100
+msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-msgid ""
-"fast-import reads a mixed command/data stream from standard input and writes "
-"one or more packfiles directly into the current repository. When EOF is "
-"received on standard input, fast import writes out updated branch and tag "
-"refs, fully updating the current repository with the newly imported data."
+#, priority:100
+msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-msgid ""
-"The fast-import backend itself can import into an empty repository (one that "
-"has already been initialized by 'git init') or incrementally update an "
-"existing populated repository. Whether or not incremental imports are "
-"supported from a particular foreign source depends on the frontend program "
-"in use."
+#, priority:100
+msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-msgid ""
-"Force updating modified existing branches, even if doing so would cause "
-"commits to be lost (as the new commit does not contain the old commit)."
+#, priority:100
+msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-msgid ""
-"Disable the output shown by --stats, making fast-import usually be silent "
-"when it is successful. However, if the import stream has directives "
-"intended to show user output (e.g. `progress` directives), the corresponding "
-"messages will still be shown."
+#, priority:100
+msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-msgid ""
-"Display some basic statistics about the objects fast-import has created, the "
-"packfiles they were stored into, and the memory used by fast-import during "
-"this run. Showing this output is currently the default, but can be disabled "
-"with --quiet."
+#, priority:100
+msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-msgid ""
-"Many command-line options can be provided as part of the fast-import stream "
-"itself by using the `feature` or `option` commands. However, some of these "
-"options are unsafe (e.g., allowing fast-import to access the filesystem "
-"outside of the repository). These options are disabled by default, but can "
-"be allowed by providing this option on the command line. This currently "
-"impacts only the `export-marks`, `import-marks`, and "
-"`import-marks-if-exists` feature commands."
+#, priority:100
+msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-msgid ""
-"Only enable this option if you trust the program generating the fast-import "
-"stream! This option is enabled automatically for remote-helpers that use the "
-"`import` capability, as they are already trusted to run their own code."
+#, priority:100
+msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap
+#, no-wrap, priority:100
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-msgid ""
-"Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file "
-"descriptor <fd> instead of `stdout`. Allows `progress` output intended for "
-"the end-user to be separated from other output."
+#, priority:100
+msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap
+#, no-wrap, priority:100
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-msgid ""
-"Specify the type of dates the frontend will supply to fast-import within "
-"`author`, `committer` and `tagger` commands. See ``Date Formats'' below for "
-"details about which formats are supported, and their syntax."
+#, priority:100
+msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-msgid ""
-"Terminate with error if there is no `done` command at the end of the "
-"stream. This option might be useful for detecting errors that cause the "
-"frontend to terminate before it has started to write a stream."
+#, priority:100
+msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap
+#, no-wrap, priority:100
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-msgid ""
-"Dumps the internal marks table to <file> when complete. Marks are written "
-"one per line as `:markid SHA-1`. Frontends can use this file to validate "
-"imports after they have been completed, or to save the marks table across "
-"incremental runs. As <file> is only opened and truncated at checkpoint (or "
-"completion) the same path can also be safely given to --import-marks."
+#, priority:100
+msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-msgid ""
-"Before processing any input, load the marks specified in <file>. The input "
-"file must exist, must be readable, and must use the same format as produced "
-"by --export-marks. Multiple options may be supplied to import more than one "
-"set of marks. If a mark is defined to different values, the last file wins."
+#, priority:100
+msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap
+#, no-wrap, priority:100
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-msgid ""
-"Like --import-marks but instead of erroring out, silently skips the file if "
-"it does not exist."
+#, priority:100
+msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-msgid ""
-"After specifying --relative-marks the paths specified with --import-marks= "
-"and --export-marks= are relative to an internal directory in the current "
-"repository. In git-fast-import this means that the paths are relative to "
-"the .git/info/fast-import directory. However, other importers may use a "
-"different location."
+#, priority:100
+msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-msgid ""
-"Relative and non-relative marks may be combined by interweaving "
-"--(no-)-relative-marks with the --(import|export)-marks= options."
+#, priority:100
+msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap
+#, no-wrap, priority:100
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap
+#, no-wrap, priority:100
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:131
-msgid ""
-"Maximum number of branches to maintain active at once. See ``Memory "
-"Utilization'' below for details. Default is 5."
+#, priority:100
+msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:132
-#, no-wrap
+#, no-wrap, priority:100
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:137
-msgid ""
-"Maximum size of a blob that fast-import will attempt to create a delta for, "
-"expressed in bytes. The default is 512m (512 MiB). Some importers may wish "
-"to lower this on systems with constrained memory."
+#, priority:100
+msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:138 en/git-fetch-pack.txt:85 en/git-pack-objects.txt:89 en/git-repack.txt:90
-#, no-wrap
+#, no-wrap, priority:100
msgid "--depth=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:141
+#, priority:100
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:142
-#, no-wrap
+#, no-wrap, priority:100
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:150
-msgid ""
-"After creating a packfile, print a line of data to <file> listing the "
-"filename of the packfile and the last commit on each branch that was written "
-"to that packfile. This information may be useful after importing projects "
-"whose total object set exceeds the 4 GiB packfile limit, as these commits "
-"can be used as edge points during calls to 'git pack-objects'."
+#, priority:100
+msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:151 en/git-pack-objects.txt:114 en/git-repack.txt:118
-#, no-wrap
+#, no-wrap, priority:100
msgid "--max-pack-size=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:154
+#, priority:100
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:155
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:157
-#, fuzzy
+#, fuzzy, priority:100
msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:159 en/git-filter-branch.txt:463 en/git-p4.txt:507
-#, no-wrap
+#, no-wrap, priority:100
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:166
-msgid ""
-"The design of fast-import allows it to import large projects in a minimum "
-"amount of memory usage and processing time. Assuming the frontend is able "
-"to keep up with fast-import and feed it a constant stream of data, import "
-"times for projects holding 10+ years of history and containing 100,000+ "
-"individual commits are generally completed in just 1-2 hours on quite modest "
-"(~$2,000 USD) hardware."
+#, priority:100
+msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:172
-msgid ""
-"Most bottlenecks appear to be in foreign source data access (the source just "
-"cannot extract revisions fast enough) or disk IO (fast-import writes as fast "
-"as the disk will take the data). Imports will run faster if the source data "
-"is stored on a different drive than the destination Git repository (due to "
-"less IO contention)."
+#, priority:100
+msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:175
-#, no-wrap
+#, no-wrap, priority:100
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:182
-msgid ""
-"A typical frontend for fast-import tends to weigh in at approximately 200 "
-"lines of Perl/Python/Ruby code. Most developers have been able to create "
-"working importers in just a couple of hours, even though it is their first "
-"exposure to fast-import, and sometimes even to Git. This is an ideal "
-"situation, given that most conversion tools are throw-away (use once, and "
-"never look back)."
+#, priority:100
+msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:185
-#, no-wrap
+#, no-wrap, priority:100
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:190
-msgid ""
-"Like 'git push' or 'git fetch', imports handled by fast-import are safe to "
-"run alongside parallel `git repack -a -d` or `git gc` invocations, or any "
-"other Git operation (including 'git prune', as loose objects are never used "
-"by fast-import)."
+#, priority:100
+msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:199
-msgid ""
-"fast-import does not lock the branch or tag refs it is actively importing. "
-"After the import, during its ref update phase, fast-import tests each "
-"existing branch ref to verify the update will be a fast-forward update (the "
-"commit stored in the ref is contained in the new history of the commit to be "
-"written). If the update is not a fast-forward update, fast-import will skip "
-"updating that ref and instead prints a warning message. fast-import will "
-"always attempt to update all branch refs, and does not stop on the first "
-"failure."
+#, priority:100
+msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:203
-msgid ""
-"Branch updates can be forced with --force, but it's recommended that this "
-"only be used on an otherwise quiet repository. Using --force is not "
-"necessary for an initial import into an empty repository."
+#, priority:100
+msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:206
-#, no-wrap
+#, no-wrap, priority:100
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:213
-msgid ""
-"fast-import tracks a set of branches in memory. Any branch can be created "
-"or modified at any point during the import process by sending a `commit` "
-"command on the input stream. This design allows a frontend program to "
-"process an unlimited number of branches simultaneously, generating commits "
-"in the order they are available from the source data. It also simplifies "
-"the frontend programs considerably."
+#, priority:100
+msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:222
-msgid ""
-"fast-import does not use or alter the current working directory, or any file "
-"within it. (It does however update the current Git repository, as "
-"referenced by `GIT_DIR`.) Therefore an import frontend may use the working "
-"directory for its own purposes, such as extracting file revisions from the "
-"foreign source. This ignorance of the working directory also allows "
-"fast-import to run very quickly, as it does not need to perform any costly "
-"file update operations when switching between branches."
+#, priority:100
+msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:224
-#, no-wrap
+#, no-wrap, priority:100
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:230
-msgid ""
-"With the exception of raw file data (which Git does not interpret) the "
-"fast-import input format is text (ASCII) based. This text based format "
-"simplifies development and debugging of frontend programs, especially when a "
-"higher level language such as Perl, Python or Ruby is being used."
+#, priority:100
+msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:238
-msgid ""
-"fast-import is very strict about its input. Where we say SP below we mean "
-"*exactly* one space. Likewise LF means one (and only one) linefeed and HT "
-"one (and only one) horizontal tab. Supplying additional whitespace "
-"characters will cause unexpected results, such as branch names or file names "
-"with leading or trailing spaces in their name, or early termination of "
-"fast-import when it encounters unexpected input."
+#, priority:100
+msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:240
-#, no-wrap
+#, no-wrap, priority:100
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:247
-msgid ""
-"To aid in debugging frontends fast-import ignores any line that begins with "
-"`#` (ASCII pound/hash) up to and including the line ending `LF`. A comment "
-"line may contain any sequence of bytes that does not contain an LF and "
-"therefore may be used to include any detailed debugging information that "
-"might be specific to the frontend and useful when inspecting a fast-import "
-"data stream."
+#, priority:100
+msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:249
-#, no-wrap
+#, no-wrap, priority:100
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:253
-msgid ""
-"The following date formats are supported. A frontend should select the "
-"format it will use for this import by passing the format name in the "
-"--date-format=<fmt> command-line option."
+#, priority:100
+msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:254
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:258
-msgid ""
-"This is the Git native format and is `<time> SP <offutc>`. It is also "
-"fast-import's default format, if --date-format was not specified."
+#, priority:100
+msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:262
-msgid ""
-"The time of the event is specified by `<time>` as the number of seconds "
-"since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII "
-"decimal integer."
+#, priority:100
+msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:268
-msgid ""
-"The local offset is specified by `<offutc>` as a positive or negative offset "
-"from UTC. For example EST (which is 5 hours behind UTC) would be expressed "
-"in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not "
-"affect `<time>`; it is used only as an advisement to help formatting "
-"routines display the timestamp."
+#, priority:100
+msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:274
-msgid ""
-"If the local offset is not available in the source material, use ``+0000'', "
-"or the most common local offset. For example many organizations have a CVS "
-"repository which has only ever been accessed by users who are located in the "
-"same location and time zone. In this case a reasonable offset from UTC "
-"could be assumed."
+#, priority:100
+msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:277
-msgid ""
-"Unlike the `rfc2822` format, this format is very strict. Any variation in "
-"formatting will cause fast-import to reject the value."
+#, priority:100
+msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:278
-#, no-wrap
+#, no-wrap, priority:100
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:280
+#, priority:100
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:285
-msgid ""
-"An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is "
-"accurate, but a little on the lenient side. It is the same parser used by "
-"'git am' when applying patches received from email."
+#, priority:100
+msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:291
-msgid ""
-"Some malformed strings may be accepted as valid dates. In some of these "
-"cases Git will still be able to obtain the correct date from the malformed "
-"string. There are also some types of malformed strings which Git will parse "
-"wrong, and yet consider valid. Seriously malformed strings will be "
-"rejected."
+#, priority:100
+msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:296
-msgid ""
-"Unlike the `raw` format above, the time zone/UTC offset information "
-"contained in an RFC 2822 date string is used to adjust the date value to UTC "
-"prior to storage. Therefore it is important that this information be as "
-"accurate as possible."
+#, priority:100
+msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:301
-msgid ""
-"If the source material uses RFC 2822 style dates, the frontend should let "
-"fast-import handle the parsing and conversion (rather than attempting to do "
-"it itself) as the Git parser has been well tested in the wild."
+#, priority:100
+msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:306
-msgid ""
-"Frontends should prefer the `raw` format if the source material already uses "
-"UNIX-epoch format, can be coaxed to give dates in that format, or its format "
-"is easily convertible to it, as there is no ambiguity in parsing."
+#, priority:100
+msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:307
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:310
-msgid ""
-"Always use the current time and time zone. The literal `now` must always be "
-"supplied for `<when>`."
+#, priority:100
+msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:315
-msgid ""
-"This is a toy format. The current time and time zone of this system is "
-"always copied into the identity string at the time it is being created by "
-"fast-import. There is no way to specify a different time or time zone."
+#, priority:100
+msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:320
-msgid ""
-"This particular format is supplied as it's short to implement and may be "
-"useful to a process that wants to create a new commit right now, without "
-"needing to use a working directory or 'git update-index'."
+#, priority:100
+msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:327
-msgid ""
-"If separate `author` and `committer` commands are used in a `commit` the "
-"timestamps may not match, as the system clock will be polled twice (once for "
-"each command). The only way to ensure that both author and committer "
-"identity information has the same timestamp is to omit `author` (thus "
-"copying from `committer`) or to use a date format other than `now`."
+#, priority:100
+msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:329
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "Commands"
msgstr "comando"
#. type: Plain text
#: en/git-fast-import.txt:333
-msgid ""
-"fast-import accepts several commands to update the current repository and "
-"control the current import process. More detailed discussion (with "
-"examples) of each command follows later."
+#, priority:100
+msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:334 en/git-fast-import.txt:403
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:338
-msgid ""
-"Creates a new branch or updates an existing branch by creating a new commit "
-"and updating the branch to point at the newly created commit."
+#, priority:100
+msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:339 en/git-fast-import.txt:793
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:344
-msgid ""
-"Creates an annotated tag object from an existing commit or branch. "
-"Lightweight tags are not supported by this command, as they are not "
-"recommended for recording meaningful points in time."
+#, priority:100
+msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:345 en/git-fast-import.txt:838
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:349
-msgid ""
-"Reset an existing branch (or a new branch) to a specific revision. This "
-"command must be used to change a branch to a specific revision without "
-"making a commit on it."
+#, priority:100
+msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:350 en/git-fast-import.txt:867
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:354
-msgid ""
-"Convert raw file data into a blob, for future use in a `commit` command. "
-"This command is optional and is not needed to perform an import."
+#, priority:100
+msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:355 en/git-fast-import.txt:940
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:361
-msgid ""
-"Record that a mark refers to a given object without first creating any new "
-"object. Using --import-marks and referring to missing marks will cause "
-"fast-import to fail, so aliases can provide a way to set otherwise pruned "
-"commits to a valid value (e.g. the nearest non-pruned ancestor)."
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:362 en/git-fast-import.txt:955
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:367
-msgid ""
-"Forces fast-import to close the current packfile, generate its unique SHA-1 "
-"checksum and index, and start a new packfile. This command is optional and "
-"is not needed to perform an import."
+#, priority:100
+msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:368 en/git-fast-import.txt:983
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:372
-msgid ""
-"Causes fast-import to echo the entire line to its own standard output. This "
-"command is optional and is not needed to perform an import."
+#, priority:100
+msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:373 en/git-fast-import.txt:1190
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:377
-msgid ""
-"Marks the end of the stream. This command is optional unless the `done` "
-"feature was requested using the `--done` command-line option or `feature "
-"done` command."
+#, priority:100
+msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:378 en/git-fast-import.txt:1008
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:382
-msgid ""
-"Causes fast-import to print the SHA-1 corresponding to a mark to the file "
-"descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
+#, priority:100
+msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:383 en/git-fast-import.txt:1023
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:387
-msgid ""
-"Causes fast-import to print a blob in 'cat-file --batch' format to the file "
-"descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
+#, priority:100
+msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:388 en/git-fast-import.txt:1054
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:392
-msgid ""
-"Causes fast-import to print a line describing a directory entry in 'ls-tree' "
-"format to the file descriptor set with `--cat-blob-fd` or `stdout` if "
-"unspecified."
+#, priority:100
+msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:393 en/git-fast-import.txt:1107
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:396
-msgid ""
-"Enable the specified feature. This requires that fast-import supports the "
-"specified feature, and aborts if it does not."
+#, priority:100
+msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:397 en/git-fast-import.txt:1162
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:401
-msgid ""
-"Specify any of the options listed under OPTIONS that do not change stream "
-"semantic to suit the frontend's needs. This command is optional and is not "
-"needed to perform an import."
+#, priority:100
+msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:406
-msgid ""
-"Create or update a branch with a new commit, recording one logical change to "
-"the project."
+#, priority:100
+msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:419
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -24111,326 +20704,247 @@ msgid ""
"\tdata\n"
"\t('from' SP <commit-ish> LF)?\n"
"\t('merge' SP <commit-ish> LF)*\n"
-"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | "
-"notemodify)*\n"
+"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:427
-msgid ""
-"where `<ref>` is the name of the branch to make the commit on. Typically "
-"branch names are prefixed with `refs/heads/` in Git, so importing the CVS "
-"branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value "
-"of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` "
-"is not valid in a Git refname, no quoting or escaping syntax is supported "
-"here."
+#, priority:100
+msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-msgid ""
-"A `mark` command may optionally appear, requesting fast-import to save a "
-"reference to the newly created commit for future use by the frontend (see "
-"below for format). It is very common for frontends to mark every commit "
-"they create, thereby allowing future branch creation from any imported "
-"commit."
+#, priority:100
+msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:439
-msgid ""
-"The `data` command following `committer` must supply the commit message (see "
-"below for `data` command syntax). To import an empty commit message use a 0 "
-"length data. Commit messages are free-form and are not interpreted by Git. "
-"Currently they must be encoded in UTF-8, as fast-import does not permit "
-"other encodings to be specified."
+#, priority:100
+msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:447
-msgid ""
-"Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, "
-"`filedeleteall` and `notemodify` commands may be included to update the "
-"contents of the branch prior to creating the commit. These commands may be "
-"supplied in any order. However it is recommended that a `filedeleteall` "
-"command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` "
-"commands in the same commit, as `filedeleteall` wipes the branch clean (see "
-"below)."
+#, priority:100
+msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-msgid ""
-"The `LF` after the command is optional (it used to be required). Note that "
-"for reasons of backward compatibility, if the commit ends with a `data` "
-"command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, "
-"`filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two "
-"`LF` commands may appear at the end of the command instead of just one."
+#, priority:100
+msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:456
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:462
-msgid ""
-"An `author` command may optionally appear, if the author information might "
-"differ from the committer information. If `author` is omitted then "
-"fast-import will automatically use the committer's information for the "
-"author portion of the commit. See below for a description of the fields in "
-"`author`, as they are identical to `committer`."
+#, priority:100
+msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:464
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:467
-msgid ""
-"The `committer` command indicates who made this commit, and when they made "
-"it."
+#, priority:100
+msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:475
-msgid ""
-"Here `<name>` is the person's display name (for example ``Com M Itter'') and "
-"`<email>` is the person's email address (``\\cm@example.com''). `LT` and "
-"`GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. "
-"These are required to delimit the email address from the other fields in the "
-"line. Note that `<name>` and `<email>` are free-form and may contain any "
-"sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 "
-"encoded."
+#, priority:100
+msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:480
-msgid ""
-"The time of the change is specified by `<when>` using the date format that "
-"was selected by the --date-format=<fmt> command-line option. See ``Date "
-"Formats'' above for the set of supported formats, and their syntax."
+#, priority:100
+msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:482
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:486
-msgid ""
-"The optional `encoding` command indicates the encoding of the commit "
-"message. Most commits are UTF-8 and the encoding is omitted, but this "
-"allows importing commit messages into git without first reencoding them."
+#, priority:100
+msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:488
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:494
-msgid ""
-"The `from` command is used to specify the commit to initialize this branch "
-"from. This revision will be the first ancestor of the new commit. The "
-"state of the tree built at this commit will begin with the state at the "
-"`from` commit, and be altered by the content modifications in this commit."
+#, priority:100
+msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:504
-msgid ""
-"Omitting the `from` command in the first commit of a new branch will cause "
-"fast-import to create that commit with no ancestor. This tends to be desired "
-"only for the initial commit of a project. If the frontend creates all files "
-"from scratch when making a new branch, a `merge` command may be used instead "
-"of `from` to start the commit with an empty tree. Omitting the `from` "
-"command on existing branches is usually desired, as the current commit on "
-"that branch is automatically assumed to be the first ancestor of the new "
-"commit."
+#, priority:100
+msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-msgid ""
-"As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or "
-"escaping syntax is supported within `<commit-ish>`."
+#, priority:100
+msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:509
+#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:513
-msgid ""
-"The name of an existing branch already in fast-import's internal branch "
-"table. If fast-import doesn't know the name, it's treated as a SHA-1 "
-"expression."
+#, priority:100
+msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:515
+#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:521
-msgid ""
-"The reason fast-import uses `:` to denote a mark reference is this character "
-"is not legal in a Git branch name. The leading `:` makes it easy to "
-"distinguish between the mark 42 (`:42`) and the branch 42 (`42` or "
-"`refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of "
-"base-10 digits."
+#, priority:100
+msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:523
+#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:525
+#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:528
-msgid ""
-"Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING "
-"REVISIONS'' in linkgit:gitrevisions[7] for details."
+#, priority:100
+msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-msgid ""
-"The special null SHA-1 (40 zeros) specifies that the branch is to be "
-"removed."
+#, priority:100
+msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-msgid ""
-"The special case of restarting an incremental import from the current branch "
-"value should be written as:"
+#, priority:100
+msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:536
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:543
-msgid ""
-"The `^0` suffix is necessary as fast-import does not permit a branch to "
-"start from itself, and the branch is created in memory before the `from` "
-"command is even read from the input. Adding `^0` will force fast-import to "
-"resolve the commit through Git's revision parsing library, rather than its "
-"internal branch table, thereby loading in the existing value of the branch."
+#, priority:100
+msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:545
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:553
-msgid ""
-"Includes one additional ancestor commit. The additional ancestry link does "
-"not change the way the tree state is built at this commit. If the `from` "
-"command is omitted when creating a new branch, the first `merge` commit will "
-"be the first ancestor of the current commit, and the branch will start out "
-"with no files. An unlimited number of `merge` commands per commit are "
-"permitted by fast-import, thereby establishing an n-way merge."
+#, priority:100
+msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:556
-msgid ""
-"Here `<commit-ish>` is any of the commit specification expressions also "
-"accepted by `from` (see above)."
+#, priority:100
+msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:558
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:562
-msgid ""
-"Included in a `commit` command to add a new file or change the content of an "
-"existing file. This command has two different means of specifying the "
-"content of the file."
+#, priority:100
+msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:563 en/git-fast-import.txt:730
-#, no-wrap
+#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:566
-msgid ""
-"The data content for the file was already supplied by a prior `blob` "
-"command. The frontend just needs to connect it."
+#, priority:100
+msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:569
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:576
-msgid ""
-"Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set "
-"by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob "
-"object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte "
-"SHA-1 of an existing Git tree object or a mark reference set with "
-"`--import-marks`."
+#, priority:100
+msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:577 en/git-fast-import.txt:743
-#, no-wrap
+#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:581
-msgid ""
-"The data content for the file has not been supplied yet. The frontend wants "
-"to supply it as part of this modify command."
+#, priority:100
+msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:585
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -24438,314 +20952,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:588 en/git-fast-import.txt:754
+#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:591
-msgid ""
-"In both formats `<mode>` is the type of file entry, specified in octal. Git "
-"only supports the following modes:"
+#, priority:100
+msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:595
-msgid ""
-"`100644` or `644`: A normal (not-executable) file. The majority of files in "
-"most projects use this mode. If in doubt, this is what you want."
+#, priority:100
+msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:596
+#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:597
+#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:600
-msgid ""
-"`160000`: A gitlink, SHA-1 of the object refers to a commit in another "
-"repository. Git links can only be specified by SHA or through a commit "
-"mark. They are used to implement submodules."
+#, priority:100
+msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:602
-msgid ""
-"`040000`: A subdirectory. Subdirectories can only be specified by SHA or "
-"through a tree mark set with `--import-marks`."
+#, priority:100
+msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:605
-msgid ""
-"In both formats `<path>` is the complete path of the file to be added (if "
-"not already existing) or modified (if already existing)."
+#, priority:100
+msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:609
-msgid ""
-"A `<path>` string must use UNIX-style directory separators (forward slash "
-"`/`), may contain any byte other than `LF`, and must not start with double "
-"quote (`\"`)."
+#, priority:100
+msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:616
-msgid ""
-"A path can use C-style string quoting; this is accepted in all cases and "
-"mandatory if the filename starts with double quote or contains `LF`. In "
-"C-style quoting, the complete name should be surrounded with double quotes, "
-"and any `LF`, backslash, or double quote characters must be escaped by "
-"preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in "
-"it\"`)."
+#, priority:100
+msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
+#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:620
+#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:621
+#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
+#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-msgid ""
-"contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` "
-"are invalid)."
+#, priority:100
+msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:626
+#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:628
+#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:630
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:636
-msgid ""
-"Included in a `commit` command to remove a file or recursively delete an "
-"entire directory from the branch. If the file or directory removal makes "
-"its parent directory empty, the parent directory will be automatically "
-"removed too. This cascades up the tree until the first non-empty directory "
-"or the root is reached."
+#, priority:100
+msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:639
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:644
-msgid ""
-"here `<path>` is the complete path of the file or subdirectory to be removed "
-"from the branch. See `filemodify` above for a detailed description of "
-"`<path>`."
+#, priority:100
+msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:646
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:651
-msgid ""
-"Recursively copies an existing file or subdirectory to a different location "
-"within the branch. The existing file or directory must exist. If the "
-"destination exists it will be completely replaced by the content copied from "
-"the source."
+#, priority:100
+msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:654
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:660 en/git-fast-import.txt:680
-msgid ""
-"here the first `<path>` is the source location and the second `<path>` is "
-"the destination. See `filemodify` above for a detailed description of what "
-"`<path>` may look like. To use a source path that contains SP the path must "
-"be quoted."
+#, priority:100
+msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:665
-msgid ""
-"A `filecopy` command takes effect immediately. Once the source location has "
-"been copied to the destination any future commands applied to the source "
-"location will not impact the destination of the copy."
+#, priority:100
+msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:667
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:671
-msgid ""
-"Renames an existing file or subdirectory to a different location within the "
-"branch. The existing file or directory must exist. If the destination "
-"exists it will be replaced by the source directory."
+#, priority:100
+msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:674
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:685
-msgid ""
-"A `filerename` command takes effect immediately. Once the source location "
-"has been renamed to the destination any future commands applied to the "
-"source location will create new files there and not impact the destination "
-"of the rename."
+#, priority:100
+msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:694
-msgid ""
-"Note that a `filerename` is the same as a `filecopy` followed by a "
-"`filedelete` of the source location. There is a slight performance "
-"advantage to using `filerename`, but the advantage is so small that it is "
-"never worth trying to convert a delete/add pair in source material into a "
-"rename for fast-import. This `filerename` command is provided just to "
-"simplify frontends that already have rename information and don't want "
-"bother with decomposing it into a `filecopy` followed by a `filedelete`."
+#, priority:100
+msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:696
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:701
-msgid ""
-"Included in a `commit` command to remove all files (and also all "
-"directories) from the branch. This command resets the internal branch "
-"structure to have no files in it, allowing the frontend to subsequently add "
-"all interesting files from scratch."
+#, priority:100
+msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:704
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:710
-msgid ""
-"This command is extremely useful if the frontend does not know (or does not "
-"care to know) what files are currently on the branch, and therefore cannot "
-"generate the proper `filedelete` commands to update the content."
+#, priority:100
+msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:718
-msgid ""
-"Issuing a `filedeleteall` followed by the needed `filemodify` commands to "
-"set the correct content will produce the same results as sending only the "
-"needed `filemodify` and `filedelete` commands. The `filedeleteall` approach "
-"may however require fast-import to use slightly more memory per active "
-"branch (less than 1 MiB for even most large projects); so frontends that can "
-"easily obtain only the affected paths for a commit are encouraged to do so."
+#, priority:100
+msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:720
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:729
-msgid ""
-"Included in a `commit` `<notes_ref>` command to add a new note annotating a "
-"`<commit-ish>` or change this annotation contents. Internally it is similar "
-"to filemodify 100644 on `<commit-ish>` path (maybe split into "
-"subdirectories). It's not advised to use any other commands to write to the "
-"`<notes_ref>` tree except `filedeleteall` to delete all existing notes in "
-"this tree. This command has two different means of specifying the content "
-"of the note."
+#, priority:100
+msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:734
-msgid ""
-"The data content for the note was already supplied by a prior `blob` "
-"command. The frontend just needs to connect it to the commit that is to be "
-"annotated."
+#, priority:100
+msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:737
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:742
-msgid ""
-"Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior "
-"`blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
+#, priority:100
+msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:747
-msgid ""
-"The data content for the note has not been supplied yet. The frontend wants "
-"to supply it as part of this modify command."
+#, priority:100
+msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:751
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -24753,87 +21212,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:757
-msgid ""
-"In both formats `<commit-ish>` is any of the commit specification "
-"expressions also accepted by `from` (see above)."
+#, priority:100
+msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:759
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:765
-msgid ""
-"Arranges for fast-import to save a reference to the current object, allowing "
-"the frontend to recall this object at a future point in time, without "
-"knowing its SHA-1. Here the current object is the object creation command "
-"the `mark` command appears within. This can be `commit`, `tag`, and `blob`, "
-"but `commit` is the most common usage."
+#, priority:100
+msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:768
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-msgid ""
-"where `<idnum>` is the number assigned by the frontend to this mark. The "
-"value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is "
-"reserved and cannot be used as a mark. Only values greater than or equal to "
-"1 may be used as marks."
+#, priority:100
+msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:778
-msgid ""
-"New marks are created automatically. Existing marks can be moved to another "
-"object simply by reusing the same `<idnum>` in another `mark` command."
+#, priority:100
+msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:780
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:785
-msgid ""
-"Provides the name of the object in the original source control system. "
-"fast-import will simply ignore this directive, but filter processes which "
-"operate on and modify the stream before feeding to fast-import may have uses "
-"for this information"
+#, priority:100
+msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:788
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:791
+#, priority:100
msgid "where `<object-identifer>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:796
-msgid ""
-"Creates an annotated tag referring to a specific commit. To create "
-"lightweight (non-annotated) tags see the `reset` command below."
+#, priority:100
+msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:804
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -24845,74 +21290,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:807
+#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:812
-msgid ""
-"Tag names are automatically prefixed with `refs/tags/` when stored in Git, "
-"so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just "
-"`RELENG-1_0-FINAL` for `<name>`, and fast-import will write the "
-"corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
+#, priority:100
+msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:816
-msgid ""
-"The value of `<name>` must be a valid refname in Git and therefore may "
-"contain forward slashes. As `LF` is not valid in a Git refname, no quoting "
-"or escaping syntax is supported here."
+#, priority:100
+msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:819
-msgid ""
-"The `from` command is the same as in the `commit` command; see above for "
-"details."
+#, priority:100
+msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:822
-msgid ""
-"The `tagger` command uses the same format as `committer` within `commit`; "
-"again see above for details."
+#, priority:100
+msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:828
-msgid ""
-"The `data` command following `tagger` must supply the annotated tag message "
-"(see below for `data` command syntax). To import an empty tag message use a "
-"0 length data. Tag messages are free-form and are not interpreted by Git. "
-"Currently they must be encoded in UTF-8, as fast-import does not permit "
-"other encodings to be specified."
+#, priority:100
+msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:836
-msgid ""
-"Signing annotated tags during import from within fast-import is not "
-"supported. Trying to include your own PGP/GPG signature is not recommended, "
-"as the frontend does not (easily) have access to the complete set of bytes "
-"which normally goes into such a signature. If signing is required, create "
-"lightweight tags from within fast-import with `reset`, then create the "
-"annotated versions of those tags offline with the standard 'git tag' "
-"process."
+#, priority:100
+msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-msgid ""
-"Creates (or recreates) the named branch, optionally starting from a specific "
-"revision. The reset command allows a frontend to issue a new `from` command "
-"for an existing branch, or to create a new branch from an existing commit "
-"without creating a new commit."
+#, priority:100
+msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:848
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -24921,26 +21347,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:852
-msgid ""
-"For a detailed description of `<ref>` and `<commit-ish>` see above under "
-"`commit` and `from`."
+#, priority:100
+msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:854 en/git-fast-import.txt:981
+#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:857
-msgid ""
-"The `reset` command can also be used to create lightweight (non-annotated) "
-"tags. For example:"
+#, priority:100
+msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:861
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -24948,22 +21373,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:865
-msgid ""
-"would create the lightweight tag `refs/tags/938` referring to whatever "
-"commit mark `:938` references."
+#, priority:100
+msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:872
-msgid ""
-"Requests writing one file revision to the packfile. The revision is not "
-"connected to any commit; this connection must be formed in a subsequent "
-"`commit` command by referencing the blob through an assigned mark."
+#, priority:100
+msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:878
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -24973,54 +21395,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-msgid ""
-"The mark command is optional here as some frontends have chosen to generate "
-"the Git SHA-1 for the blob on their own, and feed that directly to "
-"`commit`. This is typically more work than it's worth however, as marks are "
-"inexpensive to store and easy to use."
+#, priority:100
+msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:886
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:893
-msgid ""
-"Supplies raw data (for use as blob/file content, commit messages, or "
-"annotated tag messages) to fast-import. Data can be supplied using an exact "
-"byte count or delimited with a terminating line. Real frontends intended "
-"for production-quality conversions should always use the exact byte count "
-"format, as it is more robust and performs better. The delimited format is "
-"intended primarily for testing fast-import."
+#, priority:100
+msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:898
-msgid ""
-"Comment lines appearing within the `<raw>` part of `data` commands are "
-"always taken to be part of the body of the data and are therefore never "
-"ignored by fast-import. This makes it safe to import any file/message "
-"content whose lines might start with `#`."
+#, priority:100
+msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:899
-#, no-wrap
+#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:901
+#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -25028,39 +21439,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-msgid ""
-"where `<count>` is the exact number of bytes appearing within `<raw>`. The "
-"value of `<count>` is expressed as an ASCII decimal integer. The `LF` on "
-"either side of `<raw>` is not included in `<count>` and will not be included "
-"in the imported data."
+#, priority:100
+msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:916
-msgid ""
-"The `LF` after `<raw>` is optional (it used to be required) but "
-"recommended. Always including it makes debugging a fast-import stream "
-"easier as the next command always starts in column 0 of the next line, even "
-"if `<raw>` did not end with an `LF`."
+#, priority:100
+msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:917
-#, no-wrap
+#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:922
-msgid ""
-"A delimiter string is used to mark the end of the data. fast-import will "
-"compute the length by searching for the delimiter. This format is primarily "
-"useful for testing and is not recommended for real data."
+#, priority:100
+msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:928
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -25070,30 +21473,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:936
-msgid ""
-"where `<delim>` is the chosen delimiter string. The string `<delim>` must "
-"not appear on a line by itself within `<raw>`, as otherwise fast-import will "
-"think the data ends earlier than it really does. The `LF` immediately "
-"trailing `<raw>` is part of `<raw>`. This is one of the limitations of the "
-"delimited format, it is impossible to supply a data chunk which does not "
-"have an LF as its last byte."
+#, priority:100
+msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
+#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-msgid ""
-"Record that a mark refers to a given object without first creating any new "
-"object."
+#, priority:100
+msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:949
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -25103,19 +21501,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:952
+#, priority:100
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:958
-msgid ""
-"Forces fast-import to close the current packfile, start a new one, and to "
-"save out all current branch refs, tags and marks."
+#, priority:100
+msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:962
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -25123,44 +21521,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:968
-msgid ""
-"Note that fast-import automatically switches packfiles when the current "
-"packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. "
-"During an automatic packfile switch fast-import does not update the branch "
-"refs, tags or marks."
+#, priority:100
+msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:973
-msgid ""
-"As a `checkpoint` can require a significant amount of CPU time and disk IO "
-"(to compute the overall pack SHA-1 checksum, generate the corresponding "
-"index file, and update the refs) it can easily take several minutes for a "
-"single `checkpoint` command to complete."
+#, priority:100
+msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-msgid ""
-"Frontends may choose to issue checkpoints during extremely large and long "
-"running imports, or when they need to allow another Git process access to a "
-"branch. However given that a 30 GiB Subversion repository can be loaded "
-"into Git through fast-import in about 3 hours, explicit checkpointing may "
-"not be necessary."
+#, priority:100
+msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:988
-msgid ""
-"Causes fast-import to print the entire `progress` line unmodified to its "
-"standard output channel (file descriptor 1) when the command is processed "
-"from the input stream. The command otherwise has no impact on the current "
-"import, or on any of fast-import's internal state."
+#, priority:100
+msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:992
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -25168,80 +21553,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:998
-msgid ""
-"The `<any>` part of the command may contain any sequence of bytes that does "
-"not contain `LF`. The `LF` after the command is optional. Callers may wish "
-"to process the output through a tool such as sed to remove the leading part "
-"of the line, for example:"
+#, priority:100
+msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1001
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-msgid ""
-"Placing a `progress` command immediately after a `checkpoint` will inform "
-"the reader when the `checkpoint` has been completed and it can safely access "
-"the refs that fast-import updated."
+#, priority:100
+msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1014
-msgid ""
-"Causes fast-import to print the SHA-1 corresponding to a mark to stdout or "
-"to the file descriptor previously arranged with the `--cat-blob-fd` "
-"argument. The command otherwise has no impact on the current import; its "
-"purpose is to retrieve SHA-1s that later commits might want to refer to in "
-"their commit messages."
+#, priority:100
+msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1017
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1021 en/git-fast-import.txt:1052 en/git-fast-import.txt:1105
-msgid ""
-"See ``Responses To Commands'' below for details about how to read this "
-"output safely."
+#, priority:100
+msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1029
-msgid ""
-"Causes fast-import to print a blob to a file descriptor previously arranged "
-"with the `--cat-blob-fd` argument. The command otherwise has no impact on "
-"the current import; its main purpose is to retrieve blobs that may be in "
-"fast-import's memory but not accessible from the target repository."
+#, priority:100
+msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1032
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1037
-msgid ""
-"The `<dataref>` can be either a mark reference (`:<idnum>`) set previously "
-"or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
+#, priority:100
+msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1039
+#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1043
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -25249,326 +21621,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1049
-msgid ""
-"This command can be used where a `filemodify` directive can appear, allowing "
-"it to be used in the middle of a commit. For a `filemodify` using an inline "
-"directive, it can also appear right before the `data` directive."
+#, priority:100
+msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1060
-msgid ""
-"Prints information about the object at a path to a file descriptor "
-"previously arranged with the `--cat-blob-fd` argument. This allows printing "
-"a blob from the active commit (with `cat-blob`) or copying a blob or tree "
-"from a previous commit for use in the current one (with `filemodify`)."
+#, priority:100
+msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1063
-msgid ""
-"The `ls` command can also be used where a `filemodify` directive can appear, "
-"allowing it to be used in the middle of a commit."
+#, priority:100
+msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1064
-#, no-wrap
+#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1068
-msgid ""
-"This form can only be used in the middle of a `commit`. The path names a "
-"directory entry within fast-import's active commit. The path must be quoted "
-"in this case."
+#, priority:100
+msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1071
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1073
-#, no-wrap
+#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1079
-msgid ""
-"The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte "
-"SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be "
-"written. The path is relative to the top level of the tree named by "
-"`<dataref>`."
+#, priority:100
+msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1082
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1085
+#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
+#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1090
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-msgid ""
-"The <dataref> represents the blob, tree, or commit object at <path> and can "
-"be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
+#, priority:100
+msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1098
-msgid ""
-"If there is no file or subtree at that path, 'git fast-import' will instead "
-"report"
+#, priority:100
+msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1101
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1110
-msgid ""
-"Require that fast-import supports the specified feature, or abort if it does "
-"not."
+#, priority:100
+msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1113
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1116
+#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1117 en/git-fast-import.txt:1184
-#, no-wrap
+#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1118 en/git-fast-import.txt:1186
-#, no-wrap
+#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1119
-#, no-wrap
+#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1120
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1121 en/git-fast-import.txt:1188
-#, no-wrap
+#, no-wrap, priority:100
msgid "force"
msgstr "forzar"
#. type: Plain text
#: en/git-fast-import.txt:1125
-msgid ""
-"Act as though the corresponding command-line option with a leading `--` was "
-"passed on the command line (see OPTIONS, above)."
+#, priority:100
+msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1126 en/git-fast-import.txt:1185
-#, no-wrap
+#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1127
-#, no-wrap
+#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1135
-msgid ""
-"Like --import-marks except in two respects: first, only one \"feature "
-"import-marks\" or \"feature import-marks-if-exists\" command is allowed per "
-"stream; second, an --import-marks= or --import-marks-if-exists command-line "
-"option overrides any of these \"feature\" commands in the stream; third, "
-"\"feature import-marks-if-exists\" like a corresponding command-line option "
-"silently skips a nonexistent file."
+#, priority:100
+msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1136
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
#: en/git-fast-import.txt:1137
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
#: en/git-fast-import.txt:1138
-#, no-wrap
+#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1146
-msgid ""
-"Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command "
-"respectively. Versions of fast-import not supporting the specified command "
-"will exit with a message indicating so. This lets the import error out "
-"early with a clear message, rather than wasting time on the early part of an "
-"import before the unsupported command is detected."
+#, priority:100
+msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap
+#, no-wrap, priority:100
msgid "notes"
msgstr "notas"
#. type: Plain text
#: en/git-fast-import.txt:1152
-msgid ""
-"Require that the backend support the 'notemodify' (N) subcommand to the "
-"'commit' command. Versions of fast-import not supporting notes will exit "
-"with a message indicating so."
+#, priority:100
+msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1153
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "done"
msgstr "none"
#. type: Plain text
#: en/git-fast-import.txt:1160
-msgid ""
-"Error out if the stream ends without a 'done' command. Without this "
-"feature, errors causing the frontend to end abruptly at a convenient point "
-"in the stream can go undetected. This may occur, for example, if an import "
-"front end dies in mid-operation without emitting SIGTERM or SIGKILL at its "
-"subordinate git fast-import instance."
+#, priority:100
+msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1167
-msgid ""
-"Processes the specified option so that git fast-import behaves in a way that "
-"suits the frontend's needs. Note that options specified by the frontend are "
-"overridden by any options the user may specify to git fast-import itself."
+#, priority:100
+msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1170
-#, no-wrap
+#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1175
-msgid ""
-"The `<option>` part of the command may contain any of the options listed in "
-"the OPTIONS section that do not change import semantics, without the leading "
-"`--` and is treated in the same way."
+#, priority:100
+msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-msgid ""
-"Option commands must be the first commands on the input (not counting "
-"feature commands), to give an option command after any non-option command is "
-"an error."
+#, priority:100
+msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1182
-msgid ""
-"The following command-line options change import semantics and may therefore "
-"not be passed as option:"
+#, priority:100
+msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
+#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1193
-msgid ""
-"If the `done` feature is not in use, treated as if EOF was read. This can "
-"be used to tell fast-import to finish early."
+#, priority:100
+msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1197
-msgid ""
-"If the `--done` command-line option or `feature done` command is in use, the "
-"`done` command is mandatory and marks the end of the stream."
+#, priority:100
+msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1199
-#, no-wrap
+#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-msgid ""
-"New objects written by fast-import are not available immediately. Most "
-"fast-import commands have no visible effect until the next checkpoint (or "
-"completion). The frontend can send commands to fill fast-import's input "
-"pipe without worrying about how quickly they will take effect, which "
-"improves performance by simplifying scheduling."
+#, priority:100
+msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1213
-msgid ""
-"For some frontends, though, it is useful to be able to read back data from "
-"the current repository as it is being updated (for example when the source "
-"material describes objects in terms of patches to be applied to previously "
-"imported objects). This can be accomplished by connecting the frontend and "
-"fast-import via bidirectional pipes:"
+#, priority:100
+msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1218
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -25577,64 +21906,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1222
-msgid ""
-"A frontend set up this way can use `progress`, `get-mark`, `ls`, and "
-"`cat-blob` commands to read information from the import in progress."
+#, priority:100
+msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1226
-msgid ""
-"To avoid deadlock, such frontends must completely consume any pending output "
-"from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes "
-"to fast-import that might block."
+#, priority:100
+msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1228
-#, no-wrap
+#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1234
-msgid ""
-"If fast-import is supplied invalid input it will terminate with a non-zero "
-"exit status and create a crash report in the top level of the Git repository "
-"it was importing into. Crash reports contain a snapshot of the internal "
-"fast-import state as well as the most recent commands that lead up to the "
-"crash."
+#, priority:100
+msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1241
-msgid ""
-"All recent commands (including stream comments, file changes and progress "
-"commands) are shown in the command history within the crash report, but raw "
-"file data and commit messages are excluded from the crash report. This "
-"exclusion saves space within the report file and reduces the amount of "
-"buffering that fast-import must perform during execution."
+#, priority:100
+msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-msgid ""
-"After writing a crash report fast-import will close the current packfile and "
-"export the marks table. This allows the frontend developer to inspect the "
-"repository state and resume the import from the point where it crashed. The "
-"modified branches and tags are not updated during a crash, as the import did "
-"not complete successfully. Branch and tag information can be found in the "
-"crash report and must be applied manually if the update is needed."
+#, priority:100
+msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1251
+#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1267
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -25654,7 +21968,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1271
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -25663,7 +21977,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1277
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -25674,13 +21988,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1279
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1289
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -25695,13 +22009,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1290
-#, no-wrap
+#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1293
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -25709,23 +22023,25 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap
+#, no-wrap, priority:100
msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1297
+#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
+#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1302
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -25734,7 +22050,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1308
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
@@ -25746,437 +22062,325 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1312
+#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1315
-#, no-wrap
+#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1318
-msgid ""
-"The following tips and tricks have been collected from various users of "
-"fast-import, and are offered here as suggestions."
+#, priority:100
+msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1320
-#, no-wrap
+#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1328
-msgid ""
-"When doing a repository conversion, use a unique mark per commit (`mark "
-":<n>`) and supply the --export-marks option on the command line. "
-"fast-import will dump a file which lists every mark and the Git object SHA-1 "
-"that corresponds to it. If the frontend can tie the marks back to the "
-"source repository, it is easy to verify the accuracy and completeness of the "
-"import by comparing each Git commit to the corresponding source revision."
+#, priority:100
+msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1332
-msgid ""
-"Coming from a system such as Perforce or Subversion this should be quite "
-"simple, as the fast-import mark can also be the Perforce changeset number or "
-"the Subversion revision number."
+#, priority:100
+msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1334
-#, no-wrap
+#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1339
-msgid ""
-"Don't bother trying to optimize the frontend to stick to one branch at a "
-"time during an import. Although doing so might be slightly faster for "
-"fast-import, it tends to increase the complexity of the frontend code "
-"considerably."
+#, priority:100
+msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1343
-msgid ""
-"The branch LRU builtin to fast-import tends to behave very well, and the "
-"cost of activating an inactive branch is so low that bouncing around between "
-"branches has virtually no impact on import performance."
+#, priority:100
+msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1345
-#, no-wrap
+#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1350
-msgid ""
-"When importing a renamed file or directory, simply delete the old name(s) "
-"and modify the new name(s) during the corresponding commit. Git performs "
-"rename detection after-the-fact, rather than explicitly during a commit."
+#, priority:100
+msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1352
-#, no-wrap
+#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1356
-msgid ""
-"Some other SCM systems let the user create a tag from multiple files which "
-"are not from the same commit/changeset. Or to create tags which are a "
-"subset of the files available in the repository."
+#, priority:100
+msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1363
-msgid ""
-"Importing these tags as-is in Git is impossible without making at least one "
-"commit which ``fixes up'' the files to match the content of the tag. Use "
-"fast-import's `reset` command to reset a dummy branch outside of your normal "
-"branch space to the base commit for the tag, then commit one or more file "
-"fixup commits, and finally tag the dummy branch."
+#, priority:100
+msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1369
-msgid ""
-"For example since all normal branches are stored under `refs/heads/` name "
-"the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup "
-"branch used by the importer to have namespace conflicts with real branches "
-"imported from the source (the name `TAG_FIXUP` is not "
-"`refs/heads/TAG_FIXUP`)."
+#, priority:100
+msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1375
-msgid ""
-"When committing fixups, consider using `merge` to connect the commit(s) "
-"which are supplying file revisions to the fixup branch. Doing so will allow "
-"tools such as 'git blame' to track through the real commit history and "
-"properly annotate the source files."
+#, priority:100
+msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1378
-msgid ""
-"After fast-import terminates the frontend will need to do `rm "
-".git/TAG_FIXUP` to remove the dummy branch."
+#, priority:100
+msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1380
-#, no-wrap
+#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1384
-msgid ""
-"As soon as fast-import completes the Git repository is completely valid and "
-"ready for use. Typically this takes only a very short time, even for "
-"considerably large projects (100,000+ commits)."
+#, priority:100
+msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1391
-msgid ""
-"However repacking the repository is necessary to improve data locality and "
-"access performance. It can also take hours on extremely large projects "
-"(especially if -f and a large --window parameter is used). Since repacking "
-"is safe to run alongside readers and writers, run the repack in the "
-"background and let it finish when it finishes. There is no reason to wait "
-"to explore your new Git project!"
+#, priority:100
+msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-msgid ""
-"If you choose to wait for the repack, don't try to run benchmarks or "
-"performance tests until repacking is completed. fast-import outputs "
-"suboptimal packfiles that are simply never seen in real use situations."
+#, priority:100
+msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1398
-#, no-wrap
+#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-msgid ""
-"If you are repacking very old imported data (e.g. older than the last year), "
-"consider expending some extra CPU time and supplying --window=50 (or higher) "
-"when you run 'git repack'. This will take longer, but will also produce a "
-"smaller packfile. You only need to expend the effort once, and everyone "
-"using your project will benefit from the smaller repository."
+#, priority:100
+msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap
+#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1414
-msgid ""
-"Every once in a while have your frontend emit a `progress` message to "
-"fast-import. The contents of the messages are entirely free-form, so one "
-"suggestion would be to output the current month and year each time the "
-"current commit date moves into the next month. Your users will feel better "
-"knowing how much of the data stream has been processed."
+#, priority:100
+msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1417
-#, no-wrap
+#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-msgid ""
-"When packing a blob fast-import always attempts to deltify against the last "
-"blob written. Unless specifically arranged for by the frontend, this will "
-"probably not be a prior version of the same file, so the generated delta "
-"will not be the smallest possible. The resulting packfile will be "
-"compressed, but will not be optimal."
+#, priority:100
+msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1431
-msgid ""
-"Frontends which have efficient access to all revisions of a single file (for "
-"example reading an RCS/CVS ,v file) can choose to supply all revisions of "
-"that file as a sequence of consecutive `blob` commands. This allows "
-"fast-import to deltify the different file revisions against each other, "
-"saving space in the final packfile. Marks can be used to later identify "
-"individual file revisions during a sequence of `commit` commands."
+#, priority:100
+msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1438
-msgid ""
-"The packfile(s) created by fast-import do not encourage good disk access "
-"patterns. This is caused by fast-import writing the data in the order it is "
-"received on standard input, while Git typically organizes data within "
-"packfiles to make the most recent (current tip) data appear before "
-"historical data. Git also clusters commits together, speeding up revision "
-"traversal through better cache locality."
+#, priority:100
+msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1445
-msgid ""
-"For this reason it is strongly recommended that users repack the repository "
-"with `git repack -a -d` after fast-import completes, allowing Git to "
-"reorganize the packfiles for faster data access. If blob deltas are "
-"suboptimal (see above) then also adding the `-f` option to force "
-"recomputation of all deltas can significantly reduce the final packfile size "
-"(30-50% smaller can be quite typical)."
+#, priority:100
+msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1453
-msgid ""
-"Instead of running `git repack` you can also run `git gc --aggressive`, "
-"which will also optimize other things after an import (e.g. pack loose "
-"refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the "
-"`--aggressive` option will find new deltas with the `-f` option to "
-"linkgit:git-repack[1]. For the reasons elaborated on above using "
-"`--aggressive` after a fast-import is one of the few cases where it's known "
-"to be worthwhile."
+#, priority:100
+msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1455
-#, no-wrap
+#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1461
-msgid ""
-"There are a number of factors which affect how much memory fast-import "
-"requires to perform an import. Like critical sections of core Git, "
-"fast-import uses its own memory allocators to amortize any overheads "
-"associated with malloc. In practice fast-import tends to amortize any "
-"malloc overheads to 0, due to its use of large block allocations."
+#, priority:100
+msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1463
-#, no-wrap
+#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1470
-msgid ""
-"fast-import maintains an in-memory structure for every object written in "
-"this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit "
-"system the structure is 40 bytes (due to the larger pointer sizes). Objects "
-"in the table are not deallocated until fast-import terminates. Importing 2 "
-"million objects on a 32 bit system will require approximately 64 MiB of "
-"memory."
+#, priority:100
+msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1476
-msgid ""
-"The object table is actually a hashtable keyed on the object name (the "
-"unique SHA-1). This storage configuration allows fast-import to reuse an "
-"existing or already written object and avoid writing duplicates to the "
-"output packfile. Duplicate blobs are surprisingly common in an import, "
-"typically due to branch merges in the source."
+#, priority:100
+msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1478
-#, no-wrap
+#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1484
-msgid ""
-"Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, "
-"depending on pointer size) per mark. Although the array is sparse, "
-"frontends are still strongly encouraged to use marks between 1 and n, where "
-"n is the total number of marks required for this import."
+#, priority:100
+msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1486
-#, no-wrap
+#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1489
-msgid ""
-"Branches are classified as active and inactive. The memory usage of the two "
-"classes is significantly different."
+#, priority:100
+msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1495
-msgid ""
-"Inactive branches are stored in a structure which uses 96 or 120 bytes (32 "
-"bit or 64 bit systems, respectively), plus the length of the branch name "
-"(typically under 200 bytes), per branch. fast-import will easily handle as "
-"many as 10,000 inactive branches in under 2 MiB of memory."
+#, priority:100
+msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1502
-msgid ""
-"Active branches have the same overhead as inactive branches, but also "
-"contain copies of every tree that has been recently modified on that "
-"branch. If subtree `include` has not been modified since the branch became "
-"active, its contents will not be loaded into memory, but if subtree `src` "
-"has been modified by a commit since the branch became active, then its "
-"contents will be loaded in memory."
+#, priority:100
+msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1506
-msgid ""
-"As active branches store metadata about the files contained on that branch, "
-"their in-memory storage size can grow to a considerable size (see below)."
+#, priority:100
+msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-msgid ""
-"fast-import automatically moves active branches to inactive status based on "
-"a simple least-recently-used algorithm. The LRU chain is updated on each "
-"`commit` command. The maximum number of active branches can be increased or "
-"decreased on the command line with --active-branches=."
+#, priority:100
+msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap
+#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1518
-msgid ""
-"Trees (aka directories) use just 12 bytes of memory on top of the memory "
-"required for their entries (see ``per active file'' below). The cost of a "
-"tree is virtually 0, as its overhead amortizes out over the individual file "
-"entries."
+#, priority:100
+msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1520
-#, no-wrap
+#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1526
-msgid ""
-"Files (and pointers to subtrees) within active trees require 52 or 64 bytes "
-"(32/64 bit platforms) per entry. To conserve space, file and tree names are "
-"pooled in a common string table, allowing the filename ``Makefile'' to use "
-"just 16 bytes (after including the string header overhead) no matter how "
-"many times it occurs within the project."
+#, priority:100
+msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1531
-msgid ""
-"The active branch LRU, when coupled with the filename string pool and lazy "
-"loading of subtrees, allows fast-import to efficiently import projects with "
-"2,000+ branches and 45,114+ files in a very limited memory footprint (less "
-"than 2.7 MiB per active branch)."
+#, priority:100
+msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1533
-#, no-wrap
+#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1539
-msgid ""
-"Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile "
-"early, simulating a `checkpoint` command. The impatient operator can use "
-"this facility to peek at the objects and refs from an import in progress, at "
-"the cost of some added running time and worse compression."
+#, priority:100
+msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-fetch-pack(1)"
msgstr "git-fetch-pack(1)"
#. type: Plain text
#: en/git-fetch-pack.txt:7
+#, priority:100
msgid "git-fetch-pack - Receive missing objects from another repository"
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]\n"
"\t[--upload-pack=<git-upload-pack>]\n"
@@ -26186,213 +22390,181 @@ msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:21
-msgid ""
-"Usually you would want to use 'git fetch', which is a higher level wrapper "
-"of this command, instead."
+#, priority:100
+msgid "Usually you would want to use 'git fetch', which is a higher level wrapper of this command, instead."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:27
-msgid ""
-"Invokes 'git-upload-pack' on a possibly remote repository and asks it to "
-"send objects missing from this repository, to update the named heads. The "
-"list of commits available locally is found out by scanning the local refs/ "
-"hierarchy and sent to 'git-upload-pack' running on the other end."
+#, priority:100
+msgid "Invokes 'git-upload-pack' on a possibly remote repository and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally is found out by scanning the local refs/ hierarchy and sent to 'git-upload-pack' running on the other end."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:31
-msgid ""
-"This command degenerates to download everything to complete the asked refs "
-"from the remote side when the local side does not have a common ancestor "
-"commit."
+#, priority:100
+msgid "This command degenerates to download everything to complete the asked refs from the remote side when the local side does not have a common ancestor commit."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:37
+#, priority:100
msgid "Fetch all remote refs."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:43 en/git-send-pack.txt:46
-msgid ""
-"Take the list of refs from stdin, one per line. If there are refs specified "
-"on the command line in addition to this option, then the refs from stdin are "
-"processed after those on the command line."
+#, priority:100
+msgid "Take the list of refs from stdin, one per line. If there are refs specified on the command line in addition to this option, then the refs from stdin are processed after those on the command line."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:47 en/git-send-pack.txt:50
-msgid ""
-"If `--stateless-rpc` is specified together with this option then the list of "
-"refs must be in packet format (pkt-line). Each ref must be in a separate "
-"packet, and the list must end with a flush packet."
+#, priority:100
+msgid "If `--stateless-rpc` is specified together with this option then the list of refs must be in packet format (pkt-line). Each ref must be in a separate packet, and the list must end with a flush packet."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:52
-msgid ""
-"Pass `-q` flag to 'git unpack-objects'; this makes the cloning process less "
-"verbose."
+#, priority:100
+msgid "Pass `-q` flag to 'git unpack-objects'; this makes the cloning process less verbose."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:59
-msgid ""
-"Do not invoke 'git unpack-objects' on received data, but create a single "
-"packfile out of it instead, and store it in the object database. If provided "
-"twice then the pack is locked against repacking."
+#, priority:100
+msgid "Do not invoke 'git unpack-objects' on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:208 en/git-send-pack.txt:64
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--thin"
msgstr "--thin"
#. type: Plain text
#: en/git-fetch-pack.txt:63
-msgid ""
-"Fetch a \"thin\" pack, which records objects in deltified form based on "
-"objects not included in the pack to reduce network traffic."
+#, priority:100
+msgid "Fetch a \"thin\" pack, which records objects in deltified form based on objects not included in the pack to reduce network traffic."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--include-tag"
msgstr "--include-tag"
#. type: Plain text
#: en/git-fetch-pack.txt:69
-msgid ""
-"If the remote side supports it, annotated tags objects will be downloaded on "
-"the same connection as the other objects if the object the tag references is "
-"downloaded. The caller must otherwise determine the tags this option made "
-"available."
+#, priority:100
+msgid "If the remote side supports it, annotated tags objects will be downloaded on the same connection as the other objects if the object the tag references is downloaded. The caller must otherwise determine the tags this option made available."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:70
-#, no-wrap
+#, no-wrap, priority:100
msgid "--upload-pack=<git-upload-pack>"
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:81
-msgid ""
-"Use this to specify the path to 'git-upload-pack' on the remote side, if is "
-"not found on your $PATH. Installations of sshd ignores the user's "
-"environment setup scripts for login shells (e.g. .bash_profile) and your "
-"privately installed git may not be found on the system default $PATH. "
-"Another workaround suggested is to set up your $PATH in \".bashrc\", but "
-"this flag is for people who do not want to pay the overhead for "
-"non-interactive shells by having a lean .bashrc file (they set most of the "
-"things up in .bash_profile)."
+#, priority:100
+msgid "Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set up your $PATH in \".bashrc\", but this flag is for people who do not want to pay the overhead for non-interactive shells by having a lean .bashrc file (they set most of the things up in .bash_profile)."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:82
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "--exec=<git-upload-pack>"
msgstr "--exec=<git-upload-archive>"
#. type: Plain text
#: en/git-fetch-pack.txt:84
+#, priority:100
msgid "Same as --upload-pack=<git-upload-pack>."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:89
-msgid ""
-"Limit fetching to ancestor-chains not longer than n. 'git-upload-pack' "
-"treats the special depth 2147483647 as infinite even if there is an "
-"ancestor-chain that long."
+#, priority:100
+msgid "Limit fetching to ancestor-chains not longer than n. 'git-upload-pack' treats the special depth 2147483647 as infinite even if there is an ancestor-chain that long."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--deepen-relative"
msgstr "--deepen-relative"
#. type: Plain text
#: en/git-fetch-pack.txt:103
-msgid ""
-"Argument --depth specifies the number of commits from the current shallow "
-"boundary instead of from the tip of each remote branch history."
+#, priority:100
+msgid "Argument --depth specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:106
+#, priority:100
msgid "Do not show the progress."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--check-self-contained-and-connected"
msgstr "--check-self-contained-and-connected"
#. type: Plain text
#: en/git-fetch-pack.txt:110
-msgid ""
-"Output \"connectivity-ok\" if the received pack is self-contained and "
-"connected."
+#, priority:100
+msgid "Output \"connectivity-ok\" if the received pack is self-contained and connected."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:113 en/git-push.txt:370 en/git-send-pack.txt:63
+#, priority:220
msgid "Run verbosely."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:116
+#, priority:100
msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
-#, no-wrap
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:121
-msgid ""
-"The remote heads to update from. This is relative to $GIT_DIR "
-"(e.g. \"HEAD\", \"refs/heads/master\"). When unspecified, update from all "
-"heads the remote side has."
+#, priority:100
+msgid "The remote heads to update from. This is relative to $GIT_DIR (e.g. \"HEAD\", \"refs/heads/master\"). When unspecified, update from all heads the remote side has."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:125
-msgid ""
-"If the remote has enabled the options `uploadpack.allowTipSHA1InWant`, "
-"`uploadpack.allowReachableSHA1InWant`, or `uploadpack.allowAnySHA1InWant`, "
-"they may alternatively be 40-hex sha1s present on the remote."
+#, priority:100
+msgid "If the remote has enabled the options `uploadpack.allowTipSHA1InWant`, `uploadpack.allowReachableSHA1InWant`, or `uploadpack.allowAnySHA1InWant`, they may alternatively be 40-hex sha1s present on the remote."
msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "git-fetch(1)"
msgstr "git-fetch(1)"
#. type: Plain text
#: en/git-fetch.txt:7
-#, fuzzy
+#, fuzzy, priority:220
msgid "git-fetch - Download objects and refs from another repository"
msgstr "Descarga objetos y referencias de otro repositorio"
#. type: Plain text
#: en/git-fetch.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git fetch' [<options>] [<repository> [<refspec>...]]\n"
"'git fetch' [<options>] <group>\n"
@@ -26402,71 +22574,55 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:24
-msgid ""
-"Fetch branches and/or tags (collectively, \"refs\") from one or more other "
-"repositories, along with the objects necessary to complete their histories. "
-"Remote-tracking branches are updated (see the description of <refspec> below "
-"for ways to control this behavior)."
+#, priority:220
+msgid "Fetch branches and/or tags (collectively, \"refs\") from one or more other repositories, along with the objects necessary to complete their histories. Remote-tracking branches are updated (see the description of <refspec> below for ways to control this behavior)."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:32
-msgid ""
-"By default, any tag that points into the histories being fetched is also "
-"fetched; the effect is to fetch tags that point at branches that you are "
-"interested in. This default behavior can be changed by using the --tags or "
-"--no-tags options or by configuring remote.<name>.tagOpt. By using a "
-"refspec that fetches tags explicitly, you can fetch tags that do not point "
-"into branches you are interested in as well."
+#, priority:220
+msgid "By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by configuring remote.<name>.tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:37
-msgid ""
-"'git fetch' can fetch from either a single named repository or URL, or from "
-"several repositories at once if <group> is given and there is a "
-"remotes.<group> entry in the configuration file. (See "
-"linkgit:git-config[1])."
+#, priority:220
+msgid "'git fetch' can fetch from either a single named repository or URL, or from several repositories at once if <group> is given and there is a remotes.<group> entry in the configuration file. (See linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:40
-msgid ""
-"When no remote is specified, by default the `origin` remote will be used, "
-"unless there's an upstream branch configured for the current branch."
+#, priority:220
+msgid "When no remote is specified, by default the `origin` remote will be used, unless there's an upstream branch configured for the current branch."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:44
-msgid ""
-"The names of refs that are fetched, together with the object names they "
-"point at, are written to `.git/FETCH_HEAD`. This information may be used by "
-"scripts or other git commands, such as linkgit:git-pull[1]."
+#, priority:220
+msgid "The names of refs that are fetched, together with the object names they point at, are written to `.git/FETCH_HEAD`. This information may be used by scripts or other git commands, such as linkgit:git-pull[1]."
msgstr ""
#. type: Title -
#: en/git-fetch.txt:55
-#, no-wrap
+#, no-wrap, priority:220
msgid "CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]]"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:61
-msgid ""
-"You often interact with the same remote repository by regularly and "
-"repeatedly fetching from it. In order to keep track of the progress of such "
-"a remote repository, `git fetch` allows you to configure "
-"`remote.<repository>.fetch` configuration variables."
+#, priority:220
+msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote.<repository>.fetch` configuration variables."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:63
+#, priority:220
msgid "Typically such a variable may look like this:"
msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:67
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"[remote \"origin\"]\n"
"\tfetch = +refs/heads/*:refs/remotes/origin/*\n"
@@ -26474,77 +22630,55 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:70
+#, priority:220
msgid "This configuration is used in two ways:"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:80
-msgid ""
-"When `git fetch` is run without specifying what branches and/or tags to "
-"fetch on the command line, e.g. `git fetch origin` or `git fetch`, "
-"`remote.<repository>.fetch` values are used as the refspecs--they specify "
-"which refs to fetch and which local refs to update. The example above will "
-"fetch all branches that exist in the `origin` (i.e. any ref that matches the "
-"left-hand side of the value, `refs/heads/*`) and update the corresponding "
-"remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
+#, priority:220
+msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote.<repository>.fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:97
-msgid ""
-"When `git fetch` is run with explicit branches and/or tags to fetch on the "
-"command line, e.g. `git fetch origin master`, the <refspec>s given on the "
-"command line determine what are to be fetched (e.g. `master` in the example, "
-"which is a short-hand for `master:`, which in turn means \"fetch the "
-"'master' branch but I do not explicitly say what remote-tracking branch to "
-"update with it from the command line\"), and the example command will fetch "
-"_only_ the 'master' branch. The `remote.<repository>.fetch` values "
-"determine which remote-tracking branch, if any, is updated. When used in "
-"this way, the `remote.<repository>.fetch` values do not have any effect in "
-"deciding _what_ gets fetched (i.e. the values are not used as refspecs when "
-"the command-line lists refspecs); they are only used to decide _where_ the "
-"refs that are fetched are stored by acting as a mapping."
+#, priority:220
+msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the <refspec>s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch. The `remote.<repository>.fetch` values determine which remote-tracking branch, if any, is updated. When used in this way, the `remote.<repository>.fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:101
-msgid ""
-"The latter use of the `remote.<repository>.fetch` values can be overridden "
-"by giving the `--refmap=<refspec>` parameter(s) on the command line."
+#, priority:220
+msgid "The latter use of the `remote.<repository>.fetch` values can be overridden by giving the `--refmap=<refspec>` parameter(s) on the command line."
msgstr ""
#. type: Title -
#: en/git-fetch.txt:103
-#, no-wrap
+#, no-wrap, priority:220
msgid "PRUNING"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:108
-msgid ""
-"Git has a default disposition of keeping data unless it's explicitly thrown "
-"away; this extends to holding onto local references to branches on remotes "
-"that have themselves deleted those branches."
+#, priority:220
+msgid "Git has a default disposition of keeping data unless it's explicitly thrown away; this extends to holding onto local references to branches on remotes that have themselves deleted those branches."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:114
-msgid ""
-"If left to accumulate, these stale references might make performance worse "
-"on big and busy repos that have a lot of branch churn, and e.g. make the "
-"output of commands like `git branch -a --contains <commit>` needlessly "
-"verbose, as well as impacting anything else that'll work with the complete "
-"set of known references."
+#, priority:220
+msgid "If left to accumulate, these stale references might make performance worse on big and busy repos that have a lot of branch churn, and e.g. make the output of commands like `git branch -a --contains <commit>` needlessly verbose, as well as impacting anything else that'll work with the complete set of known references."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:117
+#, priority:220
msgid "These remote-tracking references can be deleted as a one-off with either of:"
msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:121
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"# While fetching\n"
"$ git fetch --prune <name>\n"
@@ -26552,7 +22686,7 @@ msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:124
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"# Only prune, don't fetch\n"
"$ git remote prune <name>\n"
@@ -26560,70 +22694,49 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:130
-msgid ""
-"To prune references as part of your normal workflow without needing to "
-"remember to run that, set `fetch.prune` globally, or `remote.<name>.prune` "
-"per-remote in the config. See linkgit:git-config[1]."
+#, priority:220
+msgid "To prune references as part of your normal workflow without needing to remember to run that, set `fetch.prune` globally, or `remote.<name>.prune` per-remote in the config. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:135
-msgid ""
-"Here's where things get tricky and more specific. The pruning feature "
-"doesn't actually care about branches, instead it'll prune local <-> "
-"remote-references as a function of the refspec of the remote (see "
-"`<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above)."
+#, priority:220
+msgid "Here's where things get tricky and more specific. The pruning feature doesn't actually care about branches, instead it'll prune local <-> remote-references as a function of the refspec of the remote (see `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above)."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:141
-msgid ""
-"Therefore if the refspec for the remote includes "
-"e.g. `refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch --prune "
-"<name> \"refs/tags/*:refs/tags/*\"` it won't be stale remote tracking "
-"branches that are deleted, but any local tag that doesn't exist on the "
-"remote."
+#, priority:220
+msgid "Therefore if the refspec for the remote includes e.g. `refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch --prune <name> \"refs/tags/*:refs/tags/*\"` it won't be stale remote tracking branches that are deleted, but any local tag that doesn't exist on the remote."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:146
-msgid ""
-"This might not be what you expect, i.e. you want to prune remote `<name>`, "
-"but also explicitly fetch tags from it, so when you fetch from it you delete "
-"all your local tags, most of which may not have come from the `<name>` "
-"remote in the first place."
+#, priority:220
+msgid "This might not be what you expect, i.e. you want to prune remote `<name>`, but also explicitly fetch tags from it, so when you fetch from it you delete all your local tags, most of which may not have come from the `<name>` remote in the first place."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:150
-msgid ""
-"So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`, "
-"or any other refspec which might map references from multiple remotes to the "
-"same local namespace."
+#, priority:220
+msgid "So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`, or any other refspec which might map references from multiple remotes to the same local namespace."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:157
-msgid ""
-"Since keeping up-to-date with both branches and tags on the remote is a "
-"common use-case the `--prune-tags` option can be supplied along with "
-"`--prune` to prune local tags that don't exist on the remote, and "
-"force-update those tags that differ. Tag pruning can also be enabled with "
-"`fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See "
-"linkgit:git-config[1]."
+#, priority:220
+msgid "Since keeping up-to-date with both branches and tags on the remote is a common use-case the `--prune-tags` option can be supplied along with `--prune` to prune local tags that don't exist on the remote, and force-update those tags that differ. Tag pruning can also be enabled with `fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:161
-msgid ""
-"The `--prune-tags` option is equivalent to having `refs/tags/*:refs/tags/*` "
-"declared in the refspecs of the remote. This can lead to some seemingly "
-"strange interactions:"
+#, priority:220
+msgid "The `--prune-tags` option is equivalent to having `refs/tags/*:refs/tags/*` declared in the refspecs of the remote. This can lead to some seemingly strange interactions:"
msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:166
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"# These both fetch tags\n"
"$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'\n"
@@ -26632,31 +22745,25 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:172
-msgid ""
-"The reason it doesn't error out when provided without `--prune` or its "
-"config versions is for flexibility of the configured versions, and to "
-"maintain a 1=1 mapping between what the command line flags do, and what the "
-"configuration versions do."
+#, priority:220
+msgid "The reason it doesn't error out when provided without `--prune` or its config versions is for flexibility of the configured versions, and to maintain a 1=1 mapping between what the command line flags do, and what the configuration versions do."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:177
-msgid ""
-"It's reasonable to e.g. configure `fetch.pruneTags=true` in `~/.gitconfig` "
-"to have tags pruned whenever `git fetch --prune` is run, without making "
-"every invocation of `git fetch` without `--prune` an error."
+#, priority:220
+msgid "It's reasonable to e.g. configure `fetch.pruneTags=true` in `~/.gitconfig` to have tags pruned whenever `git fetch --prune` is run, without making every invocation of `git fetch` without `--prune` an error."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:181
-msgid ""
-"Pruning tags with `--prune-tags` also works when fetching a URL instead of a "
-"named remote. These will all prune tags not found on origin:"
+#, priority:220
+msgid "Pruning tags with `--prune-tags` also works when fetching a URL instead of a named remote. These will all prune tags not found on origin:"
msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:187
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"$ git fetch origin --prune --prune-tags\n"
"$ git fetch origin --prune 'refs/tags/*:refs/tags/*'\n"
@@ -26666,238 +22773,229 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:195
-msgid ""
-"The output of \"git fetch\" depends on the transport method used; this "
-"section describes the output when fetching over the Git protocol (either "
-"locally or via ssh) and Smart HTTP protocol."
+#, priority:220
+msgid "The output of \"git fetch\" depends on the transport method used; this section describes the output when fetching over the Git protocol (either locally or via ssh) and Smart HTTP protocol."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:198
-msgid ""
-"The status of the fetch is output in tabular form, with each line "
-"representing the status of a single ref. Each line is of the form:"
+#, priority:220
+msgid "The status of the fetch is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:201
-#, no-wrap
+#, no-wrap, priority:220
msgid " <flag> <summary> <from> -> <to> [<reason>]\n"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:205
+#, priority:220
msgid "The status of up-to-date refs is shown only if the --verbose option is used."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:210
-msgid ""
-"In compact output mode, specified with configuration variable fetch.output, "
-"if either entire `<from>` or `<to>` is found in the other string, it will be "
-"substituted with `*` in the other string. For example, `master -> "
-"origin/master` becomes `master -> origin/*`."
+#, priority:220
+msgid "In compact output mode, specified with configuration variable fetch.output, if either entire `<from>` or `<to>` is found in the other string, it will be substituted with `*` in the other string. For example, `master -> origin/master` becomes `master -> origin/*`."
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:211 en/git-push.txt:431
-#, no-wrap
+#, no-wrap, priority:220
msgid "flag"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:213 en/git-push.txt:433
+#, priority:220
msgid "A single character indicating the status of the ref:"
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:213 en/git-push.txt:433
-#, no-wrap
+#, no-wrap, priority:220
msgid "(space)"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:214
+#, priority:220
msgid "for a successfully fetched fast-forward;"
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:214 en/git-push.txt:434
-#, no-wrap
+#, no-wrap, priority:220
msgid "`+`"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:215 en/git-push.txt:435
+#, priority:220
msgid "for a successful forced update;"
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:215 en/git-push.txt:435
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "`-`"
msgstr "`-`"
#. type: Plain text
#: en/git-fetch.txt:216
+#, priority:220
msgid "for a successfully pruned ref;"
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:216
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "`t`"
msgstr "`t`"
#. type: Plain text
#: en/git-fetch.txt:217
+#, priority:220
msgid "for a successful tag update;"
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:217 en/git-push.txt:436
-#, no-wrap
+#, no-wrap, priority:220
msgid "`*`"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:218
+#, priority:220
msgid "for a successfully fetched new ref;"
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:218 en/git-push.txt:437
-#, no-wrap
+#, no-wrap, priority:220
msgid "`!`"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:219
+#, priority:220
msgid "for a ref that was rejected or failed to update; and"
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:219 en/git-push.txt:438
-#, no-wrap
+#, no-wrap, priority:220
msgid "`=`"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:220
+#, priority:220
msgid "for a ref that was up to date and did not need fetching."
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:221 en/git-push.txt:440
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "summary"
msgstr "--summary"
#. type: Plain text
#: en/git-fetch.txt:226
-msgid ""
-"For a successfully fetched ref, the summary shows the old and new values of "
-"the ref in a form suitable for using as an argument to `git log` (this is "
-"`<old>..<new>` in most cases, and `<old>...<new>` for forced "
-"non-fast-forward updates)."
+#, ignore-ellipsis, priority:220
+msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:227 en/git-push.txt:468
-#, no-wrap
+#, no-wrap, priority:220
msgid "from"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:231
-msgid ""
-"The name of the remote ref being fetched from, minus its `refs/<type>/` "
-"prefix. In the case of deletion, the name of the remote ref is \"(none)\"."
+#, priority:220
+msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` prefix. In the case of deletion, the name of the remote ref is \"(none)\"."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
-#, no-wrap
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
+#, no-wrap, priority:220
msgid "to"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:235
+#, priority:220
msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:236 en/git-push.txt:477
-#, no-wrap
+#, no-wrap, priority:220
msgid "reason"
msgstr "raz처n"
#. type: Plain text
#: en/git-fetch.txt:240
-msgid ""
-"A human-readable explanation. In the case of successfully fetched refs, no "
-"explanation is needed. For a failed ref, the reason for failure is "
-"described."
+#, priority:220
+msgid "A human-readable explanation. In the case of successfully fetched refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:245
-#, fuzzy
+#, fuzzy, priority:220
msgid "Update the remote-tracking branches:"
msgstr "actuar en ramas de traqueo remoto"
#. type: delimited block -
#: en/git-fetch.txt:248
-#, no-wrap
+#, no-wrap, priority:220
msgid "$ git fetch origin\n"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:254
-msgid ""
-"The above command copies all branches from the remote refs/heads/ namespace "
-"and stores them to the local refs/remotes/origin/ namespace, unless the "
-"branch.<name>.fetch option is used to specify a non-default refspec."
+#, priority:220
+msgid "The above command copies all branches from the remote refs/heads/ namespace and stores them to the local refs/remotes/origin/ namespace, unless the branch.<name>.fetch option is used to specify a non-default refspec."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:256
+#, priority:220
msgid "Using refspecs explicitly:"
msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:259
-#, no-wrap
+#, no-wrap, priority:220
msgid "$ git fetch origin +pu:pu maint:tmp\n"
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:264
-msgid ""
-"This updates (or creates, as necessary) branches `pu` and `tmp` in the local "
-"repository by fetching from the branches (respectively) `pu` and `maint` "
-"from the remote repository."
+#, priority:220
+msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively) `pu` and `maint` from the remote repository."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:267
-msgid ""
-"The `pu` branch will be updated even if it does not fast-forward, because it "
-"is prefixed with a plus sign; `tmp` will not be."
+#, priority:220
+msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:270
-msgid ""
-"Peek at a remote's branch, without configuring the remote in your local "
-"repository:"
+#, priority:220
+msgid "Peek at a remote's branch, without configuring the remote in your local repository:"
msgstr ""
#. type: delimited block -
#: en/git-fetch.txt:274
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n"
"$ git log FETCH_HEAD\n"
@@ -26905,42 +23003,33 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:281
-msgid ""
-"The first command fetches the `maint` branch from the repository at "
-"`git://git.kernel.org/pub/scm/git/git.git` and the second command uses "
-"`FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched "
-"objects will eventually be removed by git's built-in housekeeping (see "
-"linkgit:git-gc[1])."
+#, priority:220
+msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:292 en/git-pull.txt:256
-msgid ""
-"Using --recurse-submodules can only fetch new commits in already checked out "
-"submodules right now. When e.g. upstream added a new submodule in the just "
-"fetched commits of the superproject the submodule itself cannot be fetched, "
-"making it impossible to check out that submodule later without having to do "
-"a fetch again. This is expected to be fixed in a future Git version."
+#, priority:220
+msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version."
msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-filter-branch(1)"
msgstr "git-filter-branch(1)"
#. type: Plain text
#: en/git-filter-branch.txt:7
+#, priority:100
msgid "git-filter-branch - Rewrite branches"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:18
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git filter-branch' [--setup <command>] [--subdirectory-filter "
-"<directory>]\n"
+"'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]\n"
"\t[--env-filter <command>] [--tree-filter <command>]\n"
"\t[--index-filter <command>] [--parent-filter <command>]\n"
"\t[--msg-filter <command>] [--commit-filter <command>]\n"
@@ -26951,48 +23040,31 @@ msgstr ""
#. type: Title -
#: en/git-filter-branch.txt:20
-#, no-wrap
+#, no-wrap, priority:100
msgid "WARNING"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:31
-msgid ""
-"'git filter-branch' has a plethora of pitfalls that can produce non-obvious "
-"manglings of the intended history rewrite (and can leave you with little "
-"time to investigate such problems since it has such abysmal performance). "
-"These safety and performance issues cannot be backward compatibly fixed and "
-"as such, its use is not recommended. Please use an alternative history "
-"filtering tool such as https://github.com/newren/git-filter-repo/[git "
-"filter-repo]. If you still need to use 'git filter-branch', please "
-"carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land "
-"mines of filter-branch, and then vigilantly avoid as many of the hazards "
-"listed there as reasonably possible."
+#, priority:100
+msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:40
-msgid ""
-"Lets you rewrite Git revision history by rewriting the branches mentioned in "
-"the <rev-list options>, applying custom filters on each revision. Those "
-"filters can modify each tree (e.g. removing a file or running a perl rewrite "
-"on all files) or information about each commit. Otherwise, all information "
-"(including original commit times or merge information) will be preserved."
+#, priority:100
+msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:47
-msgid ""
-"The command will only rewrite the _positive_ refs mentioned in the command "
-"line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify "
-"no filters, the commits will be recommitted without any changes, which would "
-"normally have no effect. Nevertheless, this may be useful in the future for "
-"compensating for some Git bugs or such, therefore such a usage is permitted."
+#, priority:100
+msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:52
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"*NOTE*: This command honors `.git/info/grafts` file and refs in\n"
"the `refs/replace/` namespace.\n"
@@ -27002,7 +23074,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:61
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"*WARNING*! The rewritten history will have different object names for all\n"
"the objects and will not converge with the original branch. You will not\n"
@@ -27016,442 +23088,337 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:65
-msgid ""
-"Always verify that the rewritten version is correct: The original refs, if "
-"different from the rewritten ones, will be stored in the namespace "
-"'refs/original/'."
+#, priority:100
+msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:69
-msgid ""
-"Note that since this operation is very I/O expensive, it might be a good "
-"idea to redirect the temporary directory off-disk with the `-d` option, "
-"e.g. on tmpfs. Reportedly the speedup is very noticeable."
+#, priority:100
+msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
#: en/git-filter-branch.txt:72
-#, no-wrap
+#, no-wrap, priority:100
msgid "Filters"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:84
-msgid ""
-"The filters are applied in the order as listed below. The <command> "
-"argument is always evaluated in the shell context using the 'eval' command "
-"(with the notable exception of the commit filter, for technical reasons). "
-"Prior to that, the `$GIT_COMMIT` environment variable will be set to contain "
-"the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, "
-"GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, "
-"and GIT_COMMITTER_DATE are taken from the current commit and exported to the "
-"environment, in order to affect the author and committer identities of the "
-"replacement commit created by linkgit:git-commit-tree[1] after the filters "
-"have run."
+#, priority:100
+msgid "The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:87
-msgid ""
-"If any evaluation of <command> returns a non-zero exit status, the whole "
-"operation will be aborted."
+#, priority:100
+msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:93
-msgid ""
-"A 'map' function is available that takes an \"original sha1 id\" argument "
-"and outputs a \"rewritten sha1 id\" if the commit has been already "
-"rewritten, and \"original sha1 id\" otherwise; the 'map' function can return "
-"several ids on separate lines if your commit filter emitted multiple "
-"commits."
+#, priority:100
+msgid "A 'map' function is available that takes an \"original sha1 id\" argument and outputs a \"rewritten sha1 id\" if the commit has been already rewritten, and \"original sha1 id\" otherwise; the 'map' function can return several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:98
-#, no-wrap
+#, no-wrap, priority:100
msgid "--setup <command>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:104
-msgid ""
-"This is not a real filter executed for each commit but a one time setup just "
-"before the loop. Therefore no commit-specific variables are defined yet. "
-"Functions or variables defined here can be used or modified in the following "
-"filter steps except the commit filter, for technical reasons."
+#, priority:100
+msgid "This is not a real filter executed for each commit but a one time setup just before the loop. Therefore no commit-specific variables are defined yet. Functions or variables defined here can be used or modified in the following filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:105
-#, no-wrap
+#, no-wrap, priority:100
msgid "--subdirectory-filter <directory>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:109
-msgid ""
-"Only look at the history which touches the given subdirectory. The result "
-"will contain that directory (and only that) as its project root. Implies "
-"<<Remap_to_ancestor>>."
+#, priority:100
+msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:110
-#, no-wrap
+#, no-wrap, priority:100
msgid "--env-filter <command>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:115
-msgid ""
-"This filter may be used if you only need to modify the environment in which "
-"the commit will be performed. Specifically, you might want to rewrite the "
-"author/committer name/email/time environment variables (see "
-"linkgit:git-commit-tree[1] for details)."
+#, priority:100
+msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:116
-#, no-wrap
+#, no-wrap, priority:100
msgid "--tree-filter <command>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:123
-msgid ""
-"This is the filter for rewriting the tree and its contents. The argument is "
-"evaluated in shell with the working directory set to the root of the checked "
-"out tree. The new tree is then used as-is (new files are auto-added, "
-"disappeared files are auto-removed - neither .gitignore files nor any other "
-"ignore rules *HAVE ANY EFFECT*!)."
+#, priority:100
+msgid "This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:124
-#, no-wrap
+#, no-wrap, priority:100
msgid "--index-filter <command>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:130
-msgid ""
-"This is the filter for rewriting the index. It is similar to the tree "
-"filter but does not check out the tree, which makes it much faster. "
-"Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES "
-"below. For hairy cases, see linkgit:git-update-index[1]."
+#, ignore-ellipsis, priority:100
+msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:131
-#, no-wrap
+#, no-wrap, priority:100
msgid "--parent-filter <command>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:138
-msgid ""
-"This is the filter for rewriting the commit's parent list. It will receive "
-"the parent string on stdin and shall output the new parent string on "
-"stdout. The parent string is in the format described in "
-"linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for "
-"a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge "
-"commit."
+#, ignore-ellipsis, priority:100
+msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:139
-#, no-wrap
+#, no-wrap, priority:100
msgid "--msg-filter <command>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:144
-msgid ""
-"This is the filter for rewriting the commit messages. The argument is "
-"evaluated in the shell with the original commit message on standard input; "
-"its standard output is used as the new commit message."
+#, priority:100
+msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:145
-#, no-wrap
+#, no-wrap, priority:100
msgid "--commit-filter <command>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:151
-msgid ""
-"This is the filter for performing the commit. If this filter is specified, "
-"it will be called instead of the 'git commit-tree' command, with arguments "
-"of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message "
-"on stdin. The commit id is expected on stdout."
+#, ignore-ellipsis, priority:100
+msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:155
-msgid ""
-"As a special extension, the commit filter may emit multiple commit ids; in "
-"that case, the rewritten children of the original commit will have all of "
-"them as parents."
+#, priority:100
+msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:160
-msgid ""
-"You can use the 'map' convenience function in this filter, and other "
-"convenience functions, too. For example, calling 'skip_commit \"$@\"' will "
-"leave out the current commit (but not its changes! If you want that, use "
-"'git rebase' instead)."
+#, priority:100
+msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:164
-msgid ""
-"You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git "
-"commit-tree \"$@\"` if you don't wish to keep commits with a single parent "
-"and that makes no change to the tree."
+#, priority:100
+msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:165
-#, no-wrap
+#, no-wrap, priority:100
msgid "--tag-name-filter <command>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:171
-msgid ""
-"This is the filter for rewriting tag names. When passed, it will be called "
-"for every tag ref that points to a rewritten object (or to a tag object "
-"which points to a rewritten object). The original tag name is passed via "
-"standard input, and the new tag name is expected on standard output."
+#, priority:100
+msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:176
-msgid ""
-"The original tags are not deleted, but can be overwritten; use "
-"\"--tag-name-filter cat\" to simply update the tags. In this case, be very "
-"careful and make sure you have the old tags backed up in case the conversion "
-"has run afoul."
+#, priority:100
+msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:187
-msgid ""
-"Nearly proper rewriting of tag objects is supported. If the tag has a "
-"message attached, a new tag object will be created with the same message, "
-"author, and timestamp. If the tag has a signature attached, the signature "
-"will be stripped. It is by definition impossible to preserve signatures. The "
-"reason this is \"nearly\" proper, is because ideally if the tag did not "
-"change (points to the same object, has the same name, etc.) it should "
-"retain any signature. That is not the case, signatures will always be "
-"removed, buyer beware. There is also no support for changing the author or "
-"timestamp (or the tag message for that matter). Tags which point to other "
-"tags will be rewritten to point to the underlying commit."
+#, priority:100
+msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.) it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:188
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
#: en/git-filter-branch.txt:195
-msgid ""
-"Some filters will generate empty commits that leave the tree untouched. "
-"This option instructs git-filter-branch to remove such commits if they have "
-"exactly one or zero non-pruned parents; merge commits will therefore remain "
-"intact. This option cannot be used together with `--commit-filter`, though "
-"the same effect can be achieved by using the provided "
-"`git_commit_non_empty_tree` function in a commit filter."
+#, priority:100
+msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:196
-#, no-wrap
+#, no-wrap, priority:100
msgid "--original <namespace>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:199
-msgid ""
-"Use this option to set the namespace where the original commits will be "
-"stored. The default value is 'refs/original'."
+#, priority:100
+msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:200
-#, no-wrap
+#, no-wrap, priority:100
msgid "-d <directory>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:207
-msgid ""
-"Use this option to set the path to the temporary directory used for "
-"rewriting. When applying a tree filter, the command needs to temporarily "
-"check out the tree to some directory, which may consume considerable space "
-"in case of large projects. By default it does this in the `.git-rewrite/` "
-"directory but you can override that choice by this parameter."
+#, priority:100
+msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:213
-msgid ""
-"'git filter-branch' refuses to start with an existing temporary directory or "
-"when there are already refs starting with 'refs/original/', unless forced."
+#, priority:100
+msgid "'git filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:214
-#, no-wrap
+#, no-wrap, priority:100
msgid "--state-branch <branch>"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:219
-msgid ""
-"This option will cause the mapping from old to new objects to be loaded from "
-"named branch upon startup and saved as a new commit to that branch upon "
-"exit, enabling incremental of large trees. If '<branch>' does not exist it "
-"will be created."
+#, priority:100
+msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:220
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<rev-list options>..."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:225
-msgid ""
-"Arguments for 'git rev-list'. All positive refs included by these options "
-"are rewritten. You may also specify options such as `--all`, but you must "
-"use `--` to separate them from the 'git filter-branch' options. Implies "
-"<<Remap_to_ancestor>>."
+#, priority:100
+msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
#: en/git-filter-branch.txt:229
-#, no-wrap
+#, no-wrap, priority:100
msgid "Remap to ancestor"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:236
-msgid ""
-"By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can "
-"limit the set of revisions which get rewritten. However, positive refs on "
-"the command line are distinguished: we don't let them be excluded by such "
-"limiters. For this purpose, they are instead rewritten to point at the "
-"nearest ancestor that was not excluded."
+#, priority:100
+msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:244
-msgid ""
-"On success, the exit status is `0`. If the filter can't find any commits to "
-"rewrite, the exit status is `2`. On any other error, the exit status may be "
-"any other non-zero value."
+#, priority:100
+msgid "On success, the exit status is `0`. If the filter can't find any commits to rewrite, the exit status is `2`. On any other error, the exit status may be any other non-zero value."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:251
-msgid ""
-"Suppose you want to remove a file (containing confidential information or "
-"copyright violation) from all commits:"
+#, priority:100
+msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:254
-#, no-wrap
+#, no-wrap, priority:100
msgid "git filter-branch --tree-filter 'rm filename' HEAD\n"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:259
-msgid ""
-"However, if the file is absent from the tree of some commit, a simple `rm "
-"filename` will fail for that tree and commit. Thus you may instead want to "
-"use `rm -f filename` as the script."
+#, priority:100
+msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:265
-msgid ""
-"Using `--index-filter` with 'git rm' yields a significantly faster version. "
-"Like with using `rm filename`, `git rm --cached filename` will fail if the "
-"file is absent from the tree of a commit. If you want to \"completely "
-"forget\" a file, it does not matter when it entered history, so we also add "
-"`--ignore-unmatch`:"
+#, priority:100
+msgid "Using `--index-filter` with 'git rm' yields a significantly faster version. Like with using `rm filename`, `git rm --cached filename` will fail if the file is absent from the tree of a commit. If you want to \"completely forget\" a file, it does not matter when it entered history, so we also add `--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:268
-#, no-wrap
-msgid ""
-"git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' "
-"HEAD\n"
+#, no-wrap, priority:100
+msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:271
+#, priority:100
msgid "Now, you will get the rewritten history saved in HEAD."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:274
-msgid ""
-"To rewrite the repository to look as if `foodir/` had been its project root, "
-"and discard all other history:"
+#, priority:100
+msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:277
-#, no-wrap
+#, no-wrap, priority:100
msgid "git filter-branch --subdirectory-filter foodir -- --all\n"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:282
-msgid ""
-"Thus you can, e.g., turn a library subdirectory into a repository of its "
-"own. Note the `--` that separates 'filter-branch' options from revision "
-"options, and the `--all` to rewrite all branches and tags."
+#, priority:100
+msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:286
-msgid ""
-"To set a commit (which typically is at the tip of another history) to be the "
-"parent of the current initial commit, in order to paste the other history "
-"behind the current history:"
+#, priority:100
+msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:289
-#, no-wrap
+#, no-wrap, priority:100
msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:295
-msgid ""
-"(if the parent string is empty - which happens when we are dealing with the "
-"initial commit - add graftcommit as a parent). Note that this assumes "
-"history with a single root (that is, no merge without common ancestors "
-"happened). If this is not the case, use:"
+#, priority:100
+msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:299
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git filter-branch --parent-filter \\\n"
"\t'test $GIT_COMMIT = <commit-id> && echo \"-p <graft-id>\" || cat' HEAD\n"
@@ -27459,12 +23426,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:302
+#, priority:100
msgid "or even simpler:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:306
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git replace --graft $commit-id $graft-id\n"
"git filter-branch $graft-id..HEAD\n"
@@ -27472,12 +23440,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:309
+#, priority:100
msgid "To remove commits authored by \"Darl McBribe\" from the history:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:318
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git filter-branch --commit-filter '\n"
"\tif [ \"$GIT_AUTHOR_NAME\" = \"Darl McBribe\" ];\n"
@@ -27490,12 +23459,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:321
+#, priority:100
msgid "The function 'skip_commit' is defined as follows:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:333
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"skip_commit()\n"
"{\n"
@@ -27511,17 +23481,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:340
-msgid ""
-"The shift magic first throws away the tree id and then the -p parameters. "
-"Note that this handles merges properly! In case Darl committed a merge "
-"between P1 and P2, it will be propagated properly and all children of the "
-"merge will become merge commits with P1,P2 as their parents instead of the "
-"merge commit."
+#, priority:100
+msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:345
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"*NOTE* the changes introduced by the commits, and which are not reverted\n"
"by subsequent commits, will still be in the rewritten branch. If you want\n"
@@ -27531,15 +23497,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:349
-msgid ""
-"You can rewrite the commit log messages using `--msg-filter`. For example, "
-"'git svn-id' strings in a repository created by 'git svn' can be removed "
-"this way:"
+#, priority:100
+msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:354
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
"\tsed -e \"/^git-svn-id:/d\"\n"
@@ -27548,14 +23512,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:358
-msgid ""
-"If you need to add 'Acked-by' lines to, say, the last 10 commits (none of "
-"which is a merge), use this command:"
+#, priority:100
+msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:364
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git filter-branch --msg-filter '\n"
"\tcat &&\n"
@@ -27565,16 +23528,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:370
-msgid ""
-"The `--env-filter` option can be used to modify committer and/or author "
-"identity. For example, if you found out that your commits have the wrong "
-"identity due to a misconfigured user.email, you can make a correction, "
-"before publishing the project, like this:"
+#, priority:100
+msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:382
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git filter-branch --env-filter '\n"
"\tif test \"$GIT_AUTHOR_EMAIL\" = \"root@localhost\"\n"
@@ -27590,20 +23550,19 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:388
-msgid ""
-"To restrict rewriting to only part of the history, specify a revision range "
-"in addition to the new branch name. The new branch name will point to the "
-"top-most revision that a 'git rev-list' of this range will print."
+#, priority:100
+msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:390
+#, priority:100
msgid "Consider this history:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:395
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" D--E--F--G--H\n"
" / /\n"
@@ -27612,23 +23571,25 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:398
+#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:401
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:404
+#, priority:100
msgid "To rewrite commits E,F,G,H, use one of these:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:408
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
"git filter-branch ... D..H --not C\n"
@@ -27636,12 +23597,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:411
+#, priority:100
msgid "To move the whole tree into a subdirectory, or remove it from there:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:418
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git filter-branch --index-filter \\\n"
"\t'git ls-files -s | sed \"s-\\t\\\"*-&newsubdir/-\" |\n"
@@ -27652,454 +23614,295 @@ msgstr ""
#. type: Title -
#: en/git-filter-branch.txt:423
-#, no-wrap
+#, no-wrap, priority:100
msgid "CHECKLIST FOR SHRINKING A REPOSITORY"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:431
-msgid ""
-"git-filter-branch can be used to get rid of a subset of files, usually with "
-"some combination of `--index-filter` and `--subdirectory-filter`. People "
-"expect the resulting repository to be smaller than the original, but you "
-"need a few more steps to actually make it smaller, because Git tries hard "
-"not to lose your objects until you tell it to. First make sure that:"
+#, priority:100
+msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:435
-msgid ""
-"You really removed all variants of a filename, if a blob was moved over its "
-"lifetime. `git log --name-only --follow --all -- filename` can help you "
-"find renames."
+#, priority:100
+msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:438
-msgid ""
-"You really filtered all refs: use `--tag-name-filter cat -- --all` when "
-"calling git-filter-branch."
+#, priority:100
+msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:441
-msgid ""
-"Then there are two ways to get a smaller repository. A safer way is to "
-"clone, that keeps your original intact."
+#, priority:100
+msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:445
-msgid ""
-"Clone it with `git clone file:///path/to/repo`. The clone will not have the "
-"removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain "
-"path just hardlinks everything!)"
+#, priority:100
+msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:450
-msgid ""
-"If you really don't want to clone it, for whatever reasons, check the "
-"following points instead (in this order). This is a very destructive "
-"approach, so *make a backup* or go back to cloning it. You have been "
-"warned."
+#, priority:100
+msgid "If you really don't want to clone it, for whatever reasons, check the following points instead (in this order). This is a very destructive approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:454
-msgid ""
-"Remove the original refs backed up by git-filter-branch: say `git "
-"for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git "
-"update-ref -d`."
+#, priority:100
+msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:456
+#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:460
-msgid ""
-"Garbage collect all unreferenced objects with `git gc --prune=now` (or if "
-"your git-gc is not new enough to support arguments to `--prune`, use `git "
-"repack -ad; git prune` instead)."
+#, priority:100
+msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:467
-msgid ""
-"The performance of git-filter-branch is glacially slow; its design makes it "
-"impossible for a backward-compatible implementation to ever be fast:"
+#, priority:100
+msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
-msgid ""
-"In editing files, git-filter-branch by design checks out each and every "
-"commit as it existed in the original repo. If your repo has 10\\^5 files "
-"and 10\\^5 commits, but each commit only modifies 5 files, then "
-"git-filter-branch will make you do 10\\^10 modifications, despite only "
-"having (at most) 5*10^5 unique blobs."
+#, priority:100
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:476
-msgid ""
-"If you try and cheat and try to make git-filter-branch only work on files "
-"modified in a commit, then two things happen"
+#, priority:100
+msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:482
-msgid ""
-"you run into problems with deletions whenever the user is simply trying to "
-"rename files (because attempting to delete files that don't exist looks like "
-"a no-op; it takes some chicanery to remap deletes across file renames when "
-"the renames happen via arbitrary user-provided shell)"
+#, priority:100
+msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:488
-msgid ""
-"even if you succeed at the map-deletes-for-renames chicanery, you still "
-"technically violate backward compatibility because users are allowed to "
-"filter files in ways that depend upon topology of commits instead of "
-"filtering solely based on file contents or names (though this has not been "
-"observed in the wild)."
+#, priority:100
+msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:495
-msgid ""
-"Even if you don't need to edit files but only want to e.g. rename or remove "
-"some and thus can avoid checking out each file (i.e. you can use "
-"--index-filter), you still are passing shell snippets for your filters. "
-"This means that for every commit, you have to have a prepared git repo where "
-"those filters can be run. That's a significant setup."
+#, priority:100
+msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters. This means that for every commit, you have to have a prepared git repo where those filters can be run. That's a significant setup."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:507
-msgid ""
-"Further, several additional files are created or updated per commit by "
-"git-filter-branch. Some of these are for supporting the convenience "
-"functions provided by git-filter-branch (such as map()), while others are "
-"for keeping track of internal state (but could have also been accessed by "
-"user filters; one of git-filter-branch's regression tests does so). This "
-"essentially amounts to using the filesystem as an IPC mechanism between "
-"git-filter-branch and the user-provided filters. Disks tend to be a slow "
-"IPC mechanism, and writing these files also effectively represents a forced "
-"synchronization point between separate processes that we hit with every "
-"commit."
+#, priority:100
+msgid "Further, several additional files are created or updated per commit by git-filter-branch. Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so). This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters. Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:513
-msgid ""
-"The user-provided shell commands will likely involve a pipeline of commands, "
-"resulting in the creation of many processes per commit. Creating and "
-"running another process takes a widely varying amount of time between "
-"operating systems, but on any platform it is very slow relative to invoking "
-"a function."
+#, priority:100
+msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit. Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:519
-msgid ""
-"git-filter-branch itself is written in shell, which is kind of slow. This "
-"is the one performance issue that could be backward-compatibly fixed, but "
-"compared to the above problems that are intrinsic to the design of "
-"git-filter-branch, the language of the tool itself is a relatively minor "
-"issue."
+#, priority:100
+msgid "git-filter-branch itself is written in shell, which is kind of slow. This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:530
-msgid ""
-"Side note: Unfortunately, people tend to fixate on the written-in-shell "
-"aspect and periodically ask if git-filter-branch could be rewritten in "
-"another language to fix the performance issues. Not only does that ignore "
-"the bigger intrinsic problems with the design, it'd help less than you'd "
-"expect: if git-filter-branch itself were not shell, then the convenience "
-"functions (map(), skip_commit(), etc) and the `--setup` argument could no "
-"longer be executed once at the beginning of the program but would instead "
-"need to be prepended to every user filter (and thus re-executed with every "
-"commit)."
+#, priority:100
+msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues. Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:541
-msgid ""
-"The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an "
-"alternative to git-filter-branch which does not suffer from these "
-"performance problems or the safety problems (mentioned below). For those "
-"with existing tooling which relies upon git-filter-branch, 'git repo-filter' "
-"also provides "
-"https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], "
-"a drop-in git-filter-branch replacement (with a few caveats). While "
-"filter-lamely suffers from all the same safety issues as git-filter-branch, "
-"it at least ameliorates the performance issues a little."
+#, priority:100
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameliorates the performance issues a little."
msgstr ""
#. type: Title -
#: en/git-filter-branch.txt:544
-#, no-wrap
+#, no-wrap, priority:100
msgid "SAFETY"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:549
-msgid ""
-"git-filter-branch is riddled with gotchas resulting in various ways to "
-"easily corrupt repos or end up with a mess worse than what you started with:"
+#, priority:100
+msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:563
-msgid ""
-"Someone can have a set of \"working and tested filters\" which they document "
-"or provide to a coworker, who then runs them on a different OS where the "
-"same commands are not working/tested (some examples in the git-filter-branch "
-"manpage are also affected by this). BSD vs. GNU userland differences can "
-"really bite. If lucky, error messages are spewed. But just as likely, the "
-"commands either don't do the filtering requested, or silently corrupt by "
-"making some unwanted change. The unwanted change may only affect a few "
-"commits, so it's not necessarily obvious either. (The fact that problems "
-"won't necessarily be obvious means they are likely to go unnoticed until the "
-"rewritten history is in use for quite a while, at which point it's really "
-"hard to justify another flag-day for another rewrite.)"
+#, priority:100
+msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this). BSD vs. GNU userland differences can really bite. If lucky, error messages are spewed. But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change. The unwanted change may only affect a few commits, so it's not necessarily obvious either. (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:573
-msgid ""
-"Filenames with spaces are often mishandled by shell snippets since they "
-"cause problems for shell pipelines. Not everyone is familiar with find "
-"-print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with "
-"these may assume such flags are not relevant because someone else renamed "
-"any such files in their repo back before the person doing the filtering "
-"joined the project. And often, even those familiar with handling arguments "
-"with spaces may not do so just because they aren't in the mindset of "
-"thinking about everything that could possibly go wrong."
+#, priority:100
+msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines. Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc. Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project. And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:584
-msgid ""
-"Non-ascii filenames can be silently removed despite being in a desired "
-"directory. Keeping only wanted paths is often done using pipelines like "
-"`git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only "
-"quote filenames if needed, so folks may not notice that one of the files "
-"didn't match the regex (at least not until it's much too late). Yes, "
-"someone who knows about core.quotePath can avoid this (unless they have "
-"other special characters like \\t, \\n, or \"), and people who use ls-files "
-"-z with something other than grep can avoid this, but that doesn't mean they "
-"will."
+#, priority:100
+msgid "Non-ascii filenames can be silently removed despite being in a desired directory. Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late). Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:591
-msgid ""
-"Similarly, when moving files around, one can find that filenames with "
-"non-ascii or special characters end up in a different directory, one that "
-"includes a double quote character. (This is technically the same issue as "
-"above with quoting, but perhaps an interesting different way that it can and "
-"has manifested as a problem.)"
+#, priority:100
+msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character. (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:600
-msgid ""
-"It's far too easy to accidentally mix up old and new history. It's still "
-"possible with any tool, but git-filter-branch almost invites it. If lucky, "
-"the only downside is users getting frustrated that they don't know how to "
-"shrink their repo and remove the old stuff. If unlucky, they merge old and "
-"new history and end up with multiple \"copies\" of each commit, some of "
-"which have unwanted or sensitive files and others which don't. This comes "
-"about in multiple different ways:"
+#, priority:100
+msgid "It's far too easy to accidentally mix up old and new history. It's still possible with any tool, but git-filter-branch almost invites it. If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff. If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't. This comes about in multiple different ways:"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:603
-msgid ""
-"the default to only doing a partial history rewrite ('--all' is not the "
-"default and few examples show it)"
+#, priority:100
+msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:605
+#, priority:100
msgid "the fact that there's no automatic post-run cleanup"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:608
-msgid ""
-"the fact that --tag-name-filter (when used to rename tags) doesn't remove "
-"the old tags but just adds new ones with the new name"
+#, priority:100
+msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:617
-msgid ""
-"the fact that little educational information is provided to inform users of "
-"the ramifications of a rewrite and how to avoid mixing old and new history. "
-"For example, this man page discusses how users need to understand that they "
-"need to rebase their changes for all their branches on top of new history "
-"(or delete and reclone), but that's only one of multiple concerns to "
-"consider. See the \"DISCUSSION\" section of the git filter-repo manual page "
-"for more details."
+#, priority:100
+msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history. For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider. See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:620
-msgid ""
-"Annotated tags can be accidentally converted to lightweight tags, due to "
-"either of two issues:"
+#, priority:100
+msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:625
-msgid ""
-"Someone can do a history rewrite, realize they messed up, restore from the "
-"backups in refs/original/, and then redo their git-filter-branch command. "
-"(The backup in refs/original/ is not a real backup; it dereferences tags "
-"first.)"
+#, priority:100
+msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command. (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:630
-msgid ""
-"Running git-filter-branch with either --tags or --all in your <rev-list "
-"options>. In order to retain annotated tags as annotated, you must use "
-"--tag-name-filter (and must not have restored from refs/original/ in a "
-"previously botched rewrite)."
+#, priority:100
+msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:636
-msgid ""
-"Any commit messages that specify an encoding will become corrupted by the "
-"rewrite; git-filter-branch ignores the encoding, takes the original bytes, "
-"and feeds it to commit-tree without telling it the proper encoding. (This "
-"happens whether or not --msg-filter is used.)"
+#, priority:100
+msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding. (This happens whether or not --msg-filter is used.)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:641
-msgid ""
-"Commit messages (even if they are all UTF-8) by default become corrupted due "
-"to not being updated -- any references to other commit hashes in commit "
-"messages will now refer to no-longer-extant commits."
+#, priority:100
+msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:652
-msgid ""
-"There are no facilities for helping users find what unwanted crud they "
-"should delete, which means they are much more likely to have incomplete or "
-"partial cleanups that sometimes result in confusion and people wasting time "
-"trying to understand. (For example, folks tend to just look for big files "
-"to delete instead of big directories or extensions, and once they do so, "
-"then sometime later folks using the new repository who are going through "
-"history will notice a build artifact directory that has some files but not "
-"others, or a cache of dependencies (node_modules or similar) which couldn't "
-"have ever been functional since it's missing some files.)"
+#, priority:100
+msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand. (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:655
-msgid ""
-"If --prune-empty isn't specified, then the filtering process can create "
-"hoards of confusing empty commits"
+#, priority:100
+msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:659
-msgid ""
-"If --prune-empty is specified, then intentionally placed empty commits from "
-"before the filtering operation are also pruned instead of just pruning "
-"commits that became empty due to filtering rules."
+#, priority:100
+msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:662
-msgid ""
-"If --prune-empty is specified, sometimes empty commits are missed and left "
-"around anyway (a somewhat rare bug, but it happens...)"
+#, ignore-ellipsis, priority:100
+msgid "If --prune-empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:666
-msgid ""
-"A minor issue, but users who have a goal to update all names and emails in a "
-"repository may be led to --env-filter which will only update authors and "
-"committers, missing taggers."
+#, priority:100
+msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:672
-msgid ""
-"If the user provides a --tag-name-filter that maps multiple tags to the same "
-"name, no warning or error is provided; git-filter-branch simply overwrites "
-"each tag in some undocumented pre-defined order resulting in only one tag at "
-"the end. (A git-filter-branch regression test requires this surprising "
-"behavior.)"
+#, priority:100
+msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end. (A git-filter-branch regression test requires this surprising behavior.)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:675
-msgid ""
-"Also, the poor performance of git-filter-branch often leads to safety "
-"issues:"
+#, priority:100
+msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:692
-msgid ""
-"Coming up with the correct shell snippet to do the filtering you want is "
-"sometimes difficult unless you're just doing a trivial modification such as "
-"deleting a couple files. Unfortunately, people often learn if the snippet "
-"is right or wrong by trying it out, but the rightness or wrongness can vary "
-"depending on special circumstances (spaces in filenames, non-ascii "
-"filenames, funny author names or emails, invalid timezones, presence of "
-"grafts or replace objects, etc.), meaning they may have to wait a long time, "
-"hit an error, then restart. The performance of git-filter-branch is so bad "
-"that this cycle is painful, reducing the time available to carefully "
-"re-check (to say nothing about what it does to the patience of the person "
-"doing the rewrite even if they do technically have more time available). "
-"This problem is extra compounded because errors from broken filters may not "
-"be shown for a long time and/or get lost in a sea of output. Even worse, "
-"broken filters often just result in silent incorrect rewrites."
+#, priority:100
+msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files. Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart. The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available). This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output. Even worse, broken filters often just result in silent incorrect rewrites."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:700
-msgid ""
-"To top it all off, even when users finally find working commands, they "
-"naturally want to share them. But they may be unaware that their repo "
-"didn't have some special cases that someone else's does. So, when someone "
-"else with a different repository runs the same commands, they get hit by the "
-"problems above. Or, the user just runs commands that really were vetted for "
-"special cases, but they run it on a different OS where it doesn't work, as "
-"noted above."
+#, priority:100
+msgid "To top it all off, even when users finally find working commands, they naturally want to share them. But they may be unaware that their repo didn't have some special cases that someone else's does. So, when someone else with a different repository runs the same commands, they get hit by the problems above. Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-fmt-merge-msg(1)"
msgstr "git-fmt-merge-msg(1)"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:7
+#, priority:100
msgid "git-fmt-merge-msg - Produce a merge commit message"
msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log]\n"
"'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>\n"
@@ -28107,101 +23910,91 @@ msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:20
-msgid ""
-"Takes the list of merged objects on stdin and produces a suitable commit "
-"message to be used for the merge commit, usually to be passed as the "
-"'<merge-message>' argument of 'git merge'."
+#, priority:100
+msgid "Takes the list of merged objects on stdin and produces a suitable commit message to be used for the merge commit, usually to be passed as the '<merge-message>' argument of 'git merge'."
msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:23
-msgid ""
-"This command is intended mostly for internal use by scripts automatically "
-"invoking 'git merge'."
+#, priority:100
+msgid "This command is intended mostly for internal use by scripts automatically invoking 'git merge'."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
-#, no-wrap
+#, no-wrap, priority:240
msgid "--log[=<n>]"
msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:33
-msgid ""
-"In addition to branch names, populate the log message with one-line "
-"descriptions from the actual commits that are being merged. At most <n> "
-"commits from each merge parent will be used (20 if <n> is omitted). This "
-"overrides the `merge.log` configuration variable."
+#, priority:100
+msgid "In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. At most <n> commits from each merge parent will be used (20 if <n> is omitted). This overrides the `merge.log` configuration variable."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:69
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-log"
msgstr "--no-log"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:37
+#, priority:100
msgid "Do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]summary"
msgstr "--[no-]summary"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:41
-msgid ""
-"Synonyms to --log and --no-log; these are deprecated and will be removed in "
-"the future."
+#, priority:100
+msgid "Synonyms to --log and --no-log; these are deprecated and will be removed in the future."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:43
-#, no-wrap
+#, no-wrap, priority:100
msgid "--message <message>"
msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:46
-msgid ""
-"Use <message> instead of the branch names for the first line of the log "
-"message. For use with `--log`."
+#, priority:100
+msgid "Use <message> instead of the branch names for the first line of the log message. For use with `--log`."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:48
-#, no-wrap
+#, no-wrap, priority:100
msgid "--file <file>"
msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:51
+#, priority:100
msgid "Take the list of merged objects from <file> instead of stdin."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:56
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "merge.summary"
msgstr "merge.summary"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:59
-msgid ""
-"Synonym to `merge.log`; this is deprecated and will be removed in the "
-"future."
+#, priority:100
+msgid "Synonym to `merge.log`; this is deprecated and will be removed in the future."
msgstr ""
#. type: delimited block -
#: en/git-fmt-merge-msg.txt:66
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git fetch origin master\n"
"$ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD\n"
@@ -28209,26 +24002,25 @@ msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:70
-msgid ""
-"Print a log message describing a merge of the \"master\" branch from the "
-"\"origin\" remote."
+#, priority:100
+msgid "Print a log message describing a merge of the \"master\" branch from the \"origin\" remote."
msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-for-each-ref(1)"
msgstr "git-for-each-ref(1)"
#. type: Plain text
#: en/git-for-each-ref.txt:7
+#, priority:100
msgid "git-for-each-ref - Output information on each ref"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]\n"
"\t\t [(--sort=<key>)...] [--format=<format>] [<pattern>...]\n"
@@ -28239,526 +24031,415 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:26
-msgid ""
-"Iterate over all refs that match `<pattern>` and show them according to the "
-"given `<format>`, after sorting them according to the given set of `<key>`. "
-"If `<count>` is given, stop after showing that many refs. The interpolated "
-"values in `<format>` can optionally be quoted as string literals in the "
-"specified host language allowing their direct evaluation in that language."
+#, priority:100
+msgid "Iterate over all refs that match `<pattern>` and show them according to the given `<format>`, after sorting them according to the given set of `<key>`. If `<count>` is given, stop after showing that many refs. The interpolated values in `<format>` can optionally be quoted as string literals in the specified host language allowing their direct evaluation in that language."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:29 en/git-show-ref.txt:88
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<pattern>..."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:34
-msgid ""
-"If one or more patterns are given, only refs are shown that match against at "
-"least one pattern, either using fnmatch(3) or literally, in the latter case "
-"matching completely or from the beginning up to a slash."
+#, priority:100
+msgid "If one or more patterns are given, only refs are shown that match against at least one pattern, either using fnmatch(3) or literally, in the latter case matching completely or from the beginning up to a slash."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid "--count=<count>"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:39
-msgid ""
-"By default the command shows all refs that match `<pattern>`. This option "
-"makes it stop after showing that many refs."
+#, priority:100
+msgid "By default the command shows all refs that match `<pattern>`. This option makes it stop after showing that many refs."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:46
-msgid ""
-"A field name to sort on. Prefix `-` to sort in descending order of the "
-"value. When unspecified, `refname` is used. You may use the --sort=<key> "
-"option multiple times, in which case the last key becomes the primary key."
+#, priority:100
+msgid "A field name to sort on. Prefix `-` to sort in descending order of the value. When unspecified, `refname` is used. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197 en/pretty-options.txt:2
-#, no-wrap
+#, no-wrap, priority:260
msgid "--format=<format>"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:59
-msgid ""
-"A string that interpolates `%(fieldname)` from a ref being shown and the "
-"object it points at. If `fieldname` is prefixed with an asterisk (`*`) and "
-"the ref points at a tag object, use the value for the field in the object "
-"which the tag object refers to (instead of the field in the tag object). "
-"When unspecified, `<format>` defaults to `%(objectname) SPC %(objecttype) "
-"TAB %(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are "
-"hex digits interpolates to character with hex code `xx`; for example `%00` "
-"interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
+#, priority:100
+msgid "A string that interpolates `%(fieldname)` from a ref being shown and the object it points at. If `fieldname` is prefixed with an asterisk (`*`) and the ref points at a tag object, use the value for the field in the object which the tag object refers to (instead of the field in the tag object). When unspecified, `<format>` defaults to `%(objectname) SPC %(objecttype) TAB %(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are hex digits interpolates to character with hex code `xx`; for example `%00` interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:64 en/git-tag.txt:129
-msgid ""
-"Respect any colors specified in the `--format` option. The `<when>` field "
-"must be one of `always`, `never`, or `auto` (if `<when>` is absent, behave "
-"as if `always` was given)."
+#, priority:240
+msgid "Respect any colors specified in the `--format` option. The `<when>` field must be one of `always`, `never`, or `auto` (if `<when>` is absent, behave as if `always` was given)."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:65
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--shell"
msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:66
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--perl"
msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:67
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--python"
msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:68
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--tcl"
msgstr "--tcl"
#. type: Plain text
#: en/git-for-each-ref.txt:73
-msgid ""
-"If given, strings that substitute `%(fieldname)` placeholders are quoted as "
-"string literals suitable for the specified host language. This is meant to "
-"produce a scriptlet that can directly be `eval`ed."
+#, priority:100
+msgid "If given, strings that substitute `%(fieldname)` placeholders are quoted as string literals suitable for the specified host language. This is meant to produce a scriptlet that can directly be `eval`ed."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:74
-#, no-wrap
+#, no-wrap, priority:100
msgid "--points-at=<object>"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:76
-#, fuzzy
+#, fuzzy, priority:100
msgid "Only list refs which points at the given object."
msgstr "mostrar solo refs que apunten al objeto dado"
#. type: Labeled list
#: en/git-for-each-ref.txt:77
-#, no-wrap
+#, no-wrap, priority:100
msgid "--merged[=<object>]"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:81
-msgid ""
-"Only list refs whose tips are reachable from the specified commit (HEAD if "
-"not specified), incompatible with `--no-merged`."
+#, priority:100
+msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified), incompatible with `--no-merged`."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:82
-#, no-wrap
+#, no-wrap, priority:100
msgid "--no-merged[=<object>]"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:86
-msgid ""
-"Only list refs whose tips are not reachable from the specified commit (HEAD "
-"if not specified), incompatible with `--merged`."
+#, priority:100
+msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified), incompatible with `--merged`."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:87
-#, no-wrap
+#, no-wrap, priority:100
msgid "--contains[=<object>]"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:90
+#, priority:100
msgid "Only list refs which contain the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:91
-#, no-wrap
+#, no-wrap, priority:100
msgid "--no-contains[=<object>]"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:94
-msgid ""
-"Only list refs which don't contain the specified commit (HEAD if not "
-"specified)."
+#, priority:100
+msgid "Only list refs which don't contain the specified commit (HEAD if not specified)."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:97
-#, fuzzy
+#, fuzzy, priority:100
msgid "Sorting and filtering refs are case insensitive."
msgstr "ordenamiento y filtrado son case-insensitive"
#. type: Title -
#: en/git-for-each-ref.txt:99
-#, no-wrap
+#, no-wrap, priority:100
msgid "FIELD NAMES"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:104
-msgid ""
-"Various values from structured fields in referenced objects can be used to "
-"interpolate into the resulting output, or as sort keys."
+#, priority:100
+msgid "Various values from structured fields in referenced objects can be used to interpolate into the resulting output, or as sort keys."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:106
+#, priority:100
msgid "For all objects, the following names can be used:"
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:107
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "refname"
msgstr "renombrar"
#. type: Plain text
#: en/git-for-each-ref.txt:123
-msgid ""
-"The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short "
-"name of the ref append `:short`. The option core.warnAmbiguousRefs is used "
-"to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is "
-"appended, strips `<N>` slash-separated path components from the front (back) "
-"of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` "
-"and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a "
-"negative number, strip as many path components as necessary from the "
-"specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` "
-"turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns "
-"`refs/tags/foo` into `refs`). When the ref does not have enough components, "
-"the result becomes an empty string if stripping with positive <N>, or it "
-"becomes the full refname if stripping with negative <N>. Neither is an "
-"error."
+#, priority:100
+msgid "The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append `:short`. The option core.warnAmbiguousRefs is used to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is appended, strips `<N>` slash-separated path components from the front (back) of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a negative number, strip as many path components as necessary from the specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns `refs/tags/foo` into `refs`). When the ref does not have enough components, the result becomes an empty string if stripping with positive <N>, or it becomes the full refname if stripping with negative <N>. Neither is an error."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:125
+#, priority:100
msgid "`strip` can be used as a synonym to `lstrip`."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:126
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "objecttype"
msgstr "`objecttype`"
#. type: Plain text
#: en/git-for-each-ref.txt:128
+#, priority:100
msgid "The type of the object (`blob`, `tree`, `commit`, `tag`)."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:129
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "objectsize"
msgstr "`objectsize`"
#. type: Plain text
#: en/git-for-each-ref.txt:133
-msgid ""
-"The size of the object (the same as 'git cat-file -s' reports). Append "
-"`:disk` to get the size, in bytes, that the object takes up on disk. See the "
-"note about on-disk sizes in the `CAVEATS` section below."
+#, priority:100
+msgid "The size of the object (the same as 'git cat-file -s' reports). Append `:disk` to get the size, in bytes, that the object takes up on disk. See the note about on-disk sizes in the `CAVEATS` section below."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:133
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "objectname"
msgstr "`objectname`"
#. type: Plain text
#: en/git-for-each-ref.txt:139
-msgid ""
-"The object name (aka SHA-1). For a non-ambiguous abbreviation of the object "
-"name append `:short`. For an abbreviation of the object name with desired "
-"length append `:short=<length>`, where the minimum length is "
-"MINIMUM_ABBREV. The length may be exceeded to ensure unique object names."
+#, priority:100
+msgid "The object name (aka SHA-1). For a non-ambiguous abbreviation of the object name append `:short`. For an abbreviation of the object name with desired length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV. The length may be exceeded to ensure unique object names."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:139
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "deltabase"
msgstr "`deltabase`"
#. type: Plain text
#: en/git-for-each-ref.txt:143
-msgid ""
-"This expands to the object name of the delta base for the given object, if "
-"it is stored as a delta. Otherwise it expands to the null object name (all "
-"zeroes)."
+#, priority:100
+msgid "This expands to the object name of the delta base for the given object, if it is stored as a delta. Otherwise it expands to the null object name (all zeroes)."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:144
-#, no-wrap
+#, no-wrap, priority:100
msgid "upstream"
msgstr "upstream"
#. type: Plain text
#: en/git-for-each-ref.txt:154
-msgid ""
-"The name of a local ref which can be considered ``upstream'' from the "
-"displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as "
-"`refname` above. Additionally respects `:track` to show \"[ahead N, behind "
-"M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" "
-"(behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also "
-"prints \"[gone]\" whenever unknown upstream ref is encountered. Append "
-"`:track,nobracket` to show tracking information without brackets (i.e "
-"\"ahead N, behind M\")."
+#, priority:100
+msgid "The name of a local ref which can be considered ``upstream'' from the displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as `refname` above. Additionally respects `:track` to show \"[ahead N, behind M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" (behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also prints \"[gone]\" whenever unknown upstream ref is encountered. Append `:track,nobracket` to show tracking information without brackets (i.e \"ahead N, behind M\")."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:161
-msgid ""
-"For any remote-tracking branch `%(upstream)`, `%(upstream:remotename)` and "
-"`%(upstream:remoteref)` refer to the name of the remote and the name of the "
-"tracked remote ref, respectively. In other words, the remote-tracking branch "
-"can be updated explicitly and individually by using the refspec "
-"`%(upstream:remoteref):%(upstream)` to fetch from `%(upstream:remotename)`."
+#, priority:100
+msgid "For any remote-tracking branch `%(upstream)`, `%(upstream:remotename)` and `%(upstream:remoteref)` refer to the name of the remote and the name of the tracked remote ref, respectively. In other words, the remote-tracking branch can be updated explicitly and individually by using the refspec `%(upstream:remoteref):%(upstream)` to fetch from `%(upstream:remotename)`."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:165
-msgid ""
-"Has no effect if the ref does not have tracking information associated with "
-"it. All the options apart from `nobracket` are mutually exclusive, but if "
-"used together the last option is selected."
+#, priority:100
+msgid "Has no effect if the ref does not have tracking information associated with it. All the options apart from `nobracket` are mutually exclusive, but if used together the last option is selected."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:166
-#, no-wrap
+#, no-wrap, priority:100
msgid "push"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:172
-msgid ""
-"The name of a local ref which represents the `@{push}` location for the "
-"displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, "
-"`:trackshort`, `:remotename`, and `:remoteref` options as `upstream` "
-"does. Produces an empty string if no `@{push}` ref is configured."
+#, priority:100
+msgid "The name of a local ref which represents the `@{push}` location for the displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, `:trackshort`, `:remotename`, and `:remoteref` options as `upstream` does. Produces an empty string if no `@{push}` ref is configured."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
-#, no-wrap
+#: en/git-for-each-ref.txt:173 en/git.txt:376
+#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:176
+#, priority:100
msgid "'*' if HEAD matches current ref (the checked out branch), ' ' otherwise."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:182
-msgid ""
-"Change output color. Followed by `:<colorname>`, where color names are "
-"described under Values in the \"CONFIGURATION FILE\" section of "
-"linkgit:git-config[1]. For example, `%(color:bold red)`."
+#, priority:100
+msgid "Change output color. Followed by `:<colorname>`, where color names are described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. For example, `%(color:bold red)`."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:183
-#, no-wrap
+#, no-wrap, priority:100
msgid "align"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:197
-msgid ""
-"Left-, middle-, or right-align the content between %(align:...) and "
-"%(end). The \"align:\" is followed by `width=<width>` and "
-"`position=<position>` in any order separated by a comma, where the "
-"`<position>` is either left, right or middle, default being left and "
-"`<width>` is the total length of the content with alignment. For brevity, "
-"the \"width=\" and/or \"position=\" prefixes may be omitted, and bare "
-"<width> and <position> used instead. For instance, "
-"`%(align:<width>,<position>)`. If the contents length is more than the width "
-"then no alignment is performed. If used with `--quote` everything in between "
-"%(align:...) and %(end) is quoted, but if nested then only the topmost level "
-"performs quoting."
+#, ignore-ellipsis, priority:100
+msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:198
-#, no-wrap
+#, no-wrap, priority:100
msgid "if"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:210
-msgid ""
-"Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If "
-"there is an atom with value or string literal after the %(if) then "
-"everything after the %(then) is printed, else if the %(else) atom is used, "
-"then everything after %(else) is printed. We ignore space when evaluating "
-"the string before %(then), this is useful when we use the %(HEAD) atom which "
-"prints either \"*\" or \" \" and we want to apply the 'if' condition only on "
-"the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to "
-"compare the value between the %(if:...) and %(then) atoms with the given "
-"string."
+#, ignore-ellipsis, priority:100
+msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:211
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "symref"
msgstr "--symref"
#. type: Plain text
#: en/git-for-each-ref.txt:216
-msgid ""
-"The ref which the given symbolic ref refers to. If not a symbolic ref, "
-"nothing is printed. Respects the `:short`, `:lstrip` and `:rstrip` options "
-"in the same way as `refname` above."
+#, priority:100
+msgid "The ref which the given symbolic ref refers to. If not a symbolic ref, nothing is printed. Respects the `:short`, `:lstrip` and `:rstrip` options in the same way as `refname` above."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:217
-#, no-wrap
+#, no-wrap, priority:100
msgid "worktreepath"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:221
-msgid ""
-"The absolute path to the worktree in which the ref is checked out, if it is "
-"checked out in any linked worktree. Empty string otherwise."
+#, priority:100
+msgid "The absolute path to the worktree in which the ref is checked out, if it is checked out in any linked worktree. Empty string otherwise."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:225
-msgid ""
-"In addition to the above, for commit and tag objects, the header field names "
-"(`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the "
-"value in the header field."
+#, priority:100
+msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:230
-msgid ""
-"For commit and tag objects, the special `creatordate` and `creator` fields "
-"will correspond to the appropriate date or name-email-date tuple from the "
-"`committer` or `tagger` fields depending on the object type. These are "
-"intended for working on a mix of annotated and lightweight tags."
+#, priority:100
+msgid "For commit and tag objects, the special `creatordate` and `creator` fields will correspond to the appropriate date or name-email-date tuple from the `committer` or `tagger` fields depending on the object type. These are intended for working on a mix of annotated and lightweight tags."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:234
-msgid ""
-"Fields that have name-email-date tuple as its value (`author`, `committer`, "
-"and `tagger`) can be suffixed with `name`, `email`, and `date` to extract "
-"the named component."
+#, priority:100
+msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:247
-msgid ""
-"The complete message in a commit and tag object is `contents`. Its first "
-"line is `contents:subject`, where subject is the concatenation of all lines "
-"of the commit message up to the first blank line. The next line is "
-"`contents:body`, where body is all of the lines after the first blank line. "
-"The optional GPG signature is `contents:signature`. The first `N` lines of "
-"the message is obtained using `contents:lines=N`. Additionally, the "
-"trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as "
-"`trailers` (or by using the historical alias `contents:trailers`). "
-"Non-trailer lines from the trailer block can be omitted with "
-"`trailers:only`. Whitespace-continuations can be removed from trailers so "
-"that each trailer appears on a line by itself with its full content with "
-"`trailers:unfold`. Both can be used together as `trailers:unfold,only`."
+#, priority:100
+msgid "The complete message in a commit and tag object is `contents`. Its first line is `contents:subject`, where subject is the concatenation of all lines of the commit message up to the first blank line. The next line is `contents:body`, where body is all of the lines after the first blank line. The optional GPG signature is `contents:signature`. The first `N` lines of the message is obtained using `contents:lines=N`. Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:251
-msgid ""
-"For sorting purposes, fields with numeric values sort in numeric order "
-"(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). "
-"All other fields are used to sort in their byte-value order."
+#, priority:100
+msgid "For sorting purposes, fields with numeric values sort in numeric order (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). All other fields are used to sort in their byte-value order."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:254
-msgid ""
-"There is also an option to sort by versions, this can be done by using the "
-"fieldname `version:refname` or its alias `v:refname`."
+#, priority:100
+msgid "There is also an option to sort by versions, this can be done by using the fieldname `version:refname` or its alias `v:refname`."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:258
-msgid ""
-"In any case, a field name that refers to a field inapplicable to the object "
-"referred by the ref does not cause an error. It returns an empty string "
-"instead."
+#, priority:100
+msgid "In any case, a field name that refers to a field inapplicable to the object referred by the ref does not cause an error. It returns an empty string instead."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:262
-msgid ""
-"As a special case for the date-type fields, you may specify a format for the "
-"date by adding `:` followed by date format name (see the values the `--date` "
-"option to linkgit:git-rev-list[1] takes)."
+#, priority:100
+msgid "As a special case for the date-type fields, you may specify a format for the date by adding `:` followed by date format name (see the values the `--date` option to linkgit:git-rev-list[1] takes)."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:265
-msgid ""
-"Some atoms like %(align) and %(if) always require a matching %(end). We "
-"call them \"opening atoms\" and sometimes denote them as %($open)."
+#, priority:100
+msgid "Some atoms like %(align) and %(if) always require a matching %(end). We call them \"opening atoms\" and sometimes denote them as %($open)."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:270
-msgid ""
-"When a scripting language specific quoting is in effect, everything between "
-"a top-level opening atom and its matching %(end) is evaluated according to "
-"the semantics of the opening atom and only its result from the top-level is "
-"quoted."
+#, priority:100
+msgid "When a scripting language specific quoting is in effect, everything between a top-level opening atom and its matching %(end) is evaluated according to the semantics of the opening atom and only its result from the top-level is quoted."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:277
-msgid ""
-"An example directly producing formatted text. Show the most recent 3 tagged "
-"commits:"
+#, priority:100
+msgid "An example directly producing formatted text. Show the most recent 3 tagged commits:"
msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:280 en/git-for-each-ref.txt:296 en/git-for-each-ref.txt:310
-#, no-wrap
+#, no-wrap, priority:100
msgid "#!/bin/sh\n"
msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:286
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git for-each-ref --count=3 --sort='-*authordate' \\\n"
"--format='From: %(*authorname) %(*authoremail)\n"
@@ -28769,7 +24450,7 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:289
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"%(*body)\n"
"' 'refs/tags'\n"
@@ -28777,14 +24458,13 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:294
-msgid ""
-"A simple example showing the use of shell eval on the output, demonstrating "
-"the use of --shell. List the prefixes of all heads:"
+#, priority:100
+msgid "A simple example showing the use of shell eval on the output, demonstrating the use of --shell. List the prefixes of all heads:"
msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:303
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git for-each-ref --shell --format=\"ref=%(refname)\" refs/heads | \\\n"
"while read entry\n"
@@ -28796,14 +24476,13 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:308
-msgid ""
-"A bit more elaborate report on tags, demonstrating that the format may be an "
-"entire script:"
+#, priority:100
+msgid "A bit more elaborate report on tags, demonstrating that the format may be an entire script:"
msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:315
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"fmt='\n"
"\tr=%(refname)\n"
@@ -28813,7 +24492,7 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:322
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\to=%(*objectname)\n"
"\tn=%(*authorname)\n"
@@ -28825,7 +24504,7 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:341
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tkind=Tag\n"
"\tif test \"z$t\" = z\n"
@@ -28849,13 +24528,13 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:343
-#, no-wrap
+#, no-wrap, priority:100
msgid " $s\n"
msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:350
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Its message reads as:\n"
"\"\n"
@@ -28867,7 +24546,7 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:356
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"eval=`git for-each-ref --shell --format=\"$fmt\" \\\n"
"\t--sort='*objecttype' \\\n"
@@ -28878,49 +24557,43 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:361
-msgid ""
-"An example to show the usage of %(if)...%(then)...%(else)...%(end). This "
-"prefixes the current branch with a star."
+#, ignore-ellipsis, priority:100
+msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star."
msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:364
-#, no-wrap
-msgid ""
-"git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) "
-"%(end)%(refname:short)\" refs/heads/\n"
+#, no-wrap, priority:100
+msgid "git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) %(end)%(refname:short)\" refs/heads/\n"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:369
-msgid ""
-"An example to show the usage of %(if)...%(then)...%(end). This prints the "
-"authorname, if present."
+#, ignore-ellipsis, priority:100
+msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present."
msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:372
-#, no-wrap
-msgid ""
-"git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by: "
-"%(authorname)%(end)\"\n"
+#, no-wrap, priority:100
+msgid "git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by: %(authorname)%(end)\"\n"
msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-format-patch(1)"
msgstr "git-format-patch(1)"
#. type: Plain text
#: en/git-format-patch.txt:7
+#, priority:100
msgid "git-format-patch - Prepare patches for e-mail submission"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:33
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n"
"\t\t [--no-thread | --thread[=<style>]]\n"
@@ -28947,730 +24620,595 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:41
-msgid ""
-"Prepare each commit with its patch in one file per commit, formatted to "
-"resemble UNIX mailbox format. The output of this command is convenient for "
-"e-mail submission or for use with 'git am'."
+#, priority:100
+msgid "Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e-mail submission or for use with 'git am'."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:43
+#, priority:100
msgid "There are two ways to specify which commits to operate on."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:47
-msgid ""
-"A single commit, <since>, specifies that the commits leading to the tip of "
-"the current branch that are not in the history that leads to the <since> to "
-"be output."
+#, priority:100
+msgid "A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:51
-msgid ""
-"Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in "
-"linkgit:gitrevisions[7]) means the commits in the specified range."
+#, priority:100
+msgid "Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]) means the commits in the specified range."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:57
-msgid ""
-"The first rule takes precedence in the case of a single <commit>. To apply "
-"the second rule, i.e., format everything since the beginning of history up "
-"until <commit>, use the `--root` option: `git format-patch --root "
-"<commit>`. If you want to format only <commit> itself, you can do this with "
-"`git format-patch -1 <commit>`."
+#, priority:100
+msgid "The first rule takes precedence in the case of a single <commit>. To apply the second rule, i.e., format everything since the beginning of history up until <commit>, use the `--root` option: `git format-patch --root <commit>`. If you want to format only <commit> itself, you can do this with `git format-patch -1 <commit>`."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:64
-msgid ""
-"By default, each output file is numbered sequentially from 1, and uses the "
-"first line of the commit message (massaged for pathname safety) as the "
-"filename. With the `--numbered-files` option, the output file names will "
-"only be numbers, without the first line of the commit appended. The names "
-"of the output files are printed to standard output, unless the `--stdout` "
-"option is specified."
+#, priority:100
+msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the `--stdout` option is specified."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:72
-msgid ""
-"If `-o` is specified, output files are created in <dir>. Otherwise they are "
-"created in the current working directory. The default path can be set with "
-"the `format.outputDirectory` configuration option. The `-o` option takes "
-"precedence over `format.outputDirectory`. To store patches in the current "
-"working directory even when `format.outputDirectory` points elsewhere, use "
-"`-o .`. All directory components will be created."
+#, priority:100
+msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:76
-msgid ""
-"By default, the subject of a single patch is \"[PATCH] \" followed by the "
-"concatenation of lines from the commit message up to the first blank line "
-"(see the DISCUSSION section of linkgit:git-commit[1])."
+#, priority:100
+msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:80
-msgid ""
-"When multiple patches are output, the subject prefix will instead be "
-"\"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. "
-"To omit patch numbers from the subject, use `-N`."
+#, priority:100
+msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:85
-msgid ""
-"If given `--thread`, `git-format-patch` will generate `In-Reply-To` and "
-"`References` headers to make the second and subsequent patch mails appear as "
-"replies to the first mail; this also generates a `Message-Id` header to "
-"reference."
+#, priority:100
+msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:91
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "-<n>"
msgstr "<n>"
#. type: Plain text
#: en/git-format-patch.txt:93
+#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:94
-#, no-wrap
+#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:95
-#, no-wrap
+#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:98
-msgid ""
-"Use <dir> to store the resulting files, instead of the current working "
-"directory."
+#, priority:100
+msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:100 en/git-shortlog.txt:30
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
#: en/git-format-patch.txt:102
+#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:104
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
#: en/git-format-patch.txt:106
+#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:107
-#, no-wrap
+#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:109
-#, fuzzy
+#, fuzzy, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
#. type: Labeled list
#: en/git-format-patch.txt:110
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
#: en/git-format-patch.txt:113
-msgid ""
-"Output file names will be a simple number sequence without the default first "
-"line of the commit appended."
+#, priority:100
+msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:115
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
#: en/git-format-patch.txt:118
+#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:124
-msgid ""
-"Add `Signed-off-by:` line to the commit message, using the committer "
-"identity of yourself. See the signoff option in linkgit:git-commit[1] for "
-"more information."
+#, priority:100
+msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:125 en/git-pack-objects.txt:59
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
#: en/git-format-patch.txt:128
-msgid ""
-"Print all commits to the standard output in mbox format, instead of creating "
-"a file for each one."
+#, priority:100
+msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:129
-#, no-wrap
+#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:133
-msgid ""
-"Create multipart/mixed attachment, the first part of which is the commit "
-"message and the patch itself in the second part, with `Content-Disposition: "
-"attachment`."
+#, priority:100
+msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:134
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
#: en/git-format-patch.txt:137
+#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:138
-#, no-wrap
+#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:142
-msgid ""
-"Create multipart/mixed attachment, the first part of which is the commit "
-"message and the patch itself in the second part, with `Content-Disposition: "
-"inline`."
+#, priority:100
+msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:143
-#, no-wrap
+#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:144
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
#: en/git-format-patch.txt:149
-msgid ""
-"Controls addition of `In-Reply-To` and `References` headers to make the "
-"second and subsequent mails appear as replies to the first. Also controls "
-"generation of the `Message-Id` header to reference."
+#, priority:100
+msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:155
-msgid ""
-"The optional <style> argument can be either `shallow` or `deep`. 'shallow' "
-"threading makes every mail a reply to the head of the series, where the head "
-"is chosen from the cover letter, the `--in-reply-to`, and the first patch "
-"mail, in this order. 'deep' threading makes every mail a reply to the "
-"previous one."
+#, priority:100
+msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:159
-msgid ""
-"The default is `--no-thread`, unless the `format.thread` configuration is "
-"set. If `--thread` is specified without a style, it defaults to the style "
-"specified by `format.thread` if any, or else `shallow`."
+#, priority:100
+msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:163
-msgid ""
-"Beware that the default for 'git send-email' is to thread emails itself. If "
-"you want `git format-patch` to take care of threading, you will want to "
-"ensure that threading is disabled for `git send-email`."
+#, priority:100
+msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:164
-#, no-wrap
+#, no-wrap, priority:100
msgid "--in-reply-to=<message id>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:168
-msgid ""
-"Make the first mail (or all the mails with `--no-thread`) appear as a reply "
-"to the given <message id>, which avoids breaking threads to provide a new "
-"patch series."
+#, priority:100
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:169
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
#: en/git-format-patch.txt:175
-msgid ""
-"Do not include a patch that matches a commit in <until>..<since>. This will "
-"examine all patches reachable from <since> but not from <until> and compare "
-"them with the patches being generated, and any patch that matches is "
-"ignored."
+#, priority:100
+msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:176
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "--cover-from-description=<mode>"
msgstr "modo-cover-from-description"
#. type: Plain text
#: en/git-format-patch.txt:179
-msgid ""
-"Controls which parts of the cover letter will be automatically populated "
-"using the branch's description."
+#, priority:100
+msgid "Controls which parts of the cover letter will be automatically populated using the branch's description."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:184
-msgid ""
-"If `<mode>` is `message` or `default`, the cover letter subject will be "
-"populated with placeholder text. The body of the cover letter will be "
-"populated with the branch's description. This is the default mode when no "
-"configuration nor command line option is specified."
+#, priority:100
+msgid "If `<mode>` is `message` or `default`, the cover letter subject will be populated with placeholder text. The body of the cover letter will be populated with the branch's description. This is the default mode when no configuration nor command line option is specified."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:188
-msgid ""
-"If `<mode>` is `subject`, the first paragraph of the branch description will "
-"populate the cover letter subject. The remainder of the description will "
-"populate the body of the cover letter."
+#, priority:100
+msgid "If `<mode>` is `subject`, the first paragraph of the branch description will populate the cover letter subject. The remainder of the description will populate the body of the cover letter."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:192
-msgid ""
-"If `<mode>` is `auto`, if the first paragraph of the branch description is "
-"greater than 100 bytes, then the mode will be `message`, otherwise `subject` "
-"will be used."
+#, priority:100
+msgid "If `<mode>` is `auto`, if the first paragraph of the branch description is greater than 100 bytes, then the mode will be `message`, otherwise `subject` will be used."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:195
-msgid ""
-"If `<mode>` is `none`, both the cover letter subject and body will be "
-"populated with placeholder text."
+#, priority:100
+msgid "If `<mode>` is `none`, both the cover letter subject and body will be populated with placeholder text."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:196
-#, no-wrap
+#, no-wrap, priority:100
msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:201
-msgid ""
-"Instead of the standard '[PATCH]' prefix in the subject line, instead use "
-"'[<subject prefix>]'. This allows for useful naming of a patch series, and "
-"can be combined with the `--numbered` option."
+#, priority:100
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:202
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
#: en/git-format-patch.txt:206
-msgid ""
-"Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For "
-"Comments\"; use this when sending an experimental patch for discussion "
-"rather than application."
+#, priority:100
+msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:207
-#, no-wrap
+#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:208
-#, no-wrap
+#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:215
-msgid ""
-"Mark the series as the <n>-th iteration of the topic. The output filenames "
-"have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, "
-"but configurable via the `--subject-prefix` option) has ` v<n>` appended to "
-"it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file "
-"that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
+#, priority:100
+msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:216
-#, no-wrap
+#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:221
-msgid ""
-"Add a `To:` header to the email headers. This is in addition to any "
-"configured headers, and may be used multiple times. The negated form "
-"`--no-to` discards all `To:` headers added so far (from config or command "
-"line)."
+#, priority:100
+msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:222
-#, no-wrap
+#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:227
-msgid ""
-"Add a `Cc:` header to the email headers. This is in addition to any "
-"configured headers, and may be used multiple times. The negated form "
-"`--no-cc` discards all `Cc:` headers added so far (from config or command "
-"line)."
+#, priority:100
+msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:228
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
#: en/git-format-patch.txt:229
-#, no-wrap
+#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:235
-msgid ""
-"Use `ident` in the `From:` header of each commit email. If the author ident "
-"of the commit is not textually identical to the provided `ident`, place a "
-"`From:` header in the body of the message with the original author. If no "
-"`ident` is given, use the committer ident."
+#, priority:100
+msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:242
-msgid ""
-"Note that this option is only useful if you are actually sending the emails "
-"and want to identify yourself as the sender, but retain the original author "
-"(and `git am` will correctly pick up the in-body header). Note also that "
-"`git send-email` already handles this transformation for you, and this "
-"option should not be used if you are feeding the result to `git send-email`."
+#, priority:100
+msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:243
-#, no-wrap
+#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:250
-msgid ""
-"Add an arbitrary header to the email headers. This is in addition to any "
-"configured headers, and may be used multiple times. For example, "
-"`--add-header=\"Organization: git-foo\"`. The negated form "
-"`--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so "
-"far from config or command line."
+#, priority:100
+msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:251
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
#: en/git-format-patch.txt:255
-msgid ""
-"In addition to the patches, generate a cover letter file containing the "
-"branch description, shortlog and the overall diffstat. You can fill in a "
-"description in the file before sending it out."
+#, priority:100
+msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:256
-#, no-wrap
+#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:264
-msgid ""
-"As a reviewer aid, insert an interdiff into the cover letter, or as "
-"commentary of the lone patch of a 1-patch series, showing the differences "
-"between the previous version of the patch series and the series currently "
-"being formatted. `previous` is a single revision naming the tip of the "
-"previous series which shares a common base with the series being formatted "
-"(for example `git format-patch --cover-letter --interdiff=feature/v1 -3 "
-"feature/v2`)."
+#, priority:100
+msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:265
-#, no-wrap
+#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:276
-msgid ""
-"As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into "
-"the cover letter, or as commentary of the lone patch of a 1-patch series, "
-"showing the differences between the previous version of the patch series and "
-"the series currently being formatted. `previous` can be a single revision "
-"naming the tip of the previous series if it shares a common base with the "
-"series being formatted (for example `git format-patch --cover-letter "
-"--range-diff=feature/v1 -3 feature/v2`), or a revision range if the two "
-"versions of the series are disjoint (for example `git format-patch "
-"--cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
+#, priority:100
+msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:281
-msgid ""
-"Note that diff options passed to the command affect how the primary product "
-"of `format-patch` is generated, and they are not passed to the underlying "
-"`range-diff` machinery used to generate the cover-letter material (this may "
-"change in the future)."
+#, priority:100
+msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:282
-#, no-wrap
+#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:287
-msgid ""
-"Used with `--range-diff`, tweak the heuristic which matches up commits "
-"between the previous and current series of patches by adjusting the "
-"creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for "
-"details."
+#, priority:100
+msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:288 en/pretty-options.txt:60
-#, no-wrap
+#, no-wrap, priority:260
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:289 en/pretty-options.txt:81
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
#: en/git-format-patch.txt:292
-msgid ""
-"Append the notes (see linkgit:git-notes[1]) for the commit after the "
-"three-dash line."
+#, priority:100
+msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:300
-msgid ""
-"The expected use case of this is to write supporting explanation for the "
-"commit that does not belong to the commit log message proper, and include it "
-"with the patch submission. While one can simply write these explanations "
-"after `format-patch` has run but before sending, keeping them as Git notes "
-"allows them to be maintained between versions of the patch series (but see "
-"the discussion of the `notes.rewrite` configuration options in "
-"linkgit:git-notes[1] to use this workflow)."
+#, priority:100
+msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:303
+#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:304
-#, no-wrap
+#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:309
-msgid ""
-"Add a signature to each message produced. Per RFC 3676 the signature is "
-"separated from the body by a line with '-- ' on it. If the signature option "
-"is omitted the signature defaults to the Git version number."
+#, priority:100
+msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:310
-#, no-wrap
+#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:312
+#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:313
-#, no-wrap
+#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:318
-msgid ""
-"Instead of using `.patch` as the suffix for generated filenames, use "
-"specified suffix. A common alternative is `--suffix=.txt`. Leaving this "
-"empty will remove the `.patch` suffix."
+#, priority:100
+msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:321
-msgid ""
-"Note that the leading character does not have to be a dot; for example, you "
-"can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
+#, priority:100
+msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:325
+#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:326
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
#: en/git-format-patch.txt:331
-msgid ""
-"Do not output contents of changes in binary files, instead display a notice "
-"that those files changed. Patches generated using this option cannot be "
-"applied properly, but they are still useful for code review."
+#, priority:100
+msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:332
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
#: en/git-format-patch.txt:335
-msgid ""
-"Output an all-zero hash in each patch's From header instead of the hash of "
-"the commit."
+#, priority:100
+msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:336
-#, no-wrap
+#, no-wrap, priority:100
msgid "--[no-]base[=<commit>]"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:342
-msgid ""
-"Record the base tree information to identify the state the patch series "
-"applies to. See the BASE TREE INFORMATION section below for details. If "
-"<commit> is \"auto\", a base commit is automatically chosen. The `--no-base` "
-"option overrides a `format.useAutoBase` configuration."
+#, priority:100
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen. The `--no-base` option overrides a `format.useAutoBase` configuration."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:349
-msgid ""
-"Treat the revision argument as a <revision range>, even if it is just a "
-"single commit (that would normally be treated as a <since>). Note that root "
-"commits included in the specified range are always formatted as creation "
-"patches, independently of this flag."
+#, priority:100
+msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:352
+#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:360
-msgid ""
-"You can specify extra mail header lines to be added to each message, "
-"defaults for the subject prefix and file suffix, number patches when "
-"outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure "
-"attachments, change the patch output directory, and sign off patches with "
-"configuration variables."
+#, priority:100
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:374
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[format]\n"
"\theaders = \"Organization: git-foo\\n\"\n"
@@ -29688,21 +25226,18 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:383
-msgid ""
-"The patch produced by 'git format-patch' is in UNIX mailbox format, with a "
-"fixed \"magic\" time stamp to indicate that the file is output from "
-"format-patch rather than a real mailbox, like so:"
+#, priority:100
+msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:393
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
"From: Tony Luck <tony.luck@intel.com>\n"
"Date: Tue, 13 Jul 2010 11:42:54 -0700\n"
-"Subject: [PATCH] "
-"=?UTF-8?q?[IA64]=20Put=20ia64=20config=20files=20on=20the=20?=\n"
+"Subject: [PATCH] =?UTF-8?q?[IA64]=20Put=20ia64=20config=20files=20on=20the=20?=\n"
" =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20diet?=\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29711,7 +25246,7 @@ msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:396
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
"(See commit c2330e286f68f1c408b4aa6515ba49d57f05beae comment)\n"
@@ -29719,7 +25254,7 @@ msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:399
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
"...\n"
@@ -29727,27 +25262,19 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:407
-msgid ""
-"Typically it will be placed in a MUA's drafts folder, edited to add timely "
-"commentary that should not go in the changelog after the three dashes, and "
-"then sent as a message whose body, in our example, starts with \"arch/arm "
-"config files were...\". On the receiving end, readers can save interesting "
-"patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
+#, ignore-ellipsis, priority:100
+msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:413
-msgid ""
-"When a patch is part of an ongoing discussion, the patch generated by 'git "
-"format-patch' can be tweaked to take advantage of the 'git am --scissors' "
-"feature. After your response to the discussion comes a line that consists "
-"solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch "
-"with unnecessary header fields removed:"
+#, priority:100
+msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:417
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
"> So we should do such-and-such.\n"
@@ -29755,13 +25282,13 @@ msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:419
-#, no-wrap
+#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:422
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
@@ -29769,7 +25296,7 @@ msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:425
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
"...\n"
@@ -29777,63 +25304,61 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:433
-msgid ""
-"When sending a patch this way, most often you are sending your own patch, so "
-"in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit "
-"`From:` and `Date:` lines from the patch file. The patch title is likely to "
-"be different from the subject of the discussion the patch is in response to, "
-"so it is likely that you would want to keep the Subject: line, like the "
-"example above."
+#, priority:100
+msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
#: en/git-format-patch.txt:435
-#, no-wrap
+#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:438
-msgid ""
-"Many mailers if not set up properly will corrupt whitespace. Here are two "
-"common types of corruption:"
+#, priority:100
+msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:440
+#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:443
+#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:445
+#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:449
-msgid ""
-"Send the patch to yourself, exactly the way you would, except with To: and "
-"Cc: lines that do not contain the list and maintainer address."
+#, priority:100
+msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:452
+#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:454
+#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:459
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
"$ git switch test-apply\n"
@@ -29843,209 +25368,175 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:461
+#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:466
-msgid ""
-"The patch itself does not apply cleanly. That is _bad_ but does not have "
-"much to do with your MUA. You might want to rebase the patch with "
-"linkgit:git-rebase[1] before regenerating it in this case."
+#, priority:100
+msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:471
-msgid ""
-"The MUA corrupted your patch; \"am\" would complain that the patch does not "
-"apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' "
-"file contains and check for the common corruption patterns mentioned above."
+#, priority:100
+msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:479
-msgid ""
-"While at it, check the 'info' and 'final-commit' files as well. If what is "
-"in 'final-commit' is not exactly what you would want to see in the commit "
-"log message, it is very likely that the receiver would end up hand editing "
-"the log message when applying your patch. Things like \"Hi, this is my "
-"first patch.\\n\" in the patch e-mail should come after the three-dash line "
-"that signals the end of the commit message."
+#, priority:100
+msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
#: en/git-format-patch.txt:481
-#, no-wrap
+#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:484
-msgid ""
-"Here are some hints on how to successfully submit patches inline using "
-"various mailers."
+#, priority:100
+msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
#: en/git-format-patch.txt:486
-#, no-wrap
+#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:492
-msgid ""
-"GMail does not have any way to turn off line wrapping in the web interface, "
-"so it will mangle any emails that you send. You can however use \"git "
-"send-email\" and send your patches through the GMail SMTP server, or use any "
-"IMAP email client to connect to the google IMAP server and forward the "
-"emails through that."
+#, priority:100
+msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:495
-msgid ""
-"For hints on using 'git send-email' to send your patches through the GMail "
-"SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
+#, priority:100
+msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:498
-msgid ""
-"For hints on submission using the IMAP interface, see the EXAMPLE section of "
-"linkgit:git-imap-send[1]."
+#, priority:100
+msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
#: en/git-format-patch.txt:500
-#, no-wrap
+#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:504
-msgid ""
-"By default, Thunderbird will both wrap emails as well as flag them as being "
-"'format=flowed', both of which will make the resulting email unusable by "
-"Git."
+#, priority:100
+msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:508
-msgid ""
-"There are three different approaches: use an add-on to turn off line wraps, "
-"configure Thunderbird to not mangle patches, or use an external editor to "
-"keep Thunderbird from mangling the patches."
+#, priority:100
+msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
#: en/git-format-patch.txt:510
-#, no-wrap
+#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:518
-msgid ""
-"Install the Toggle Word Wrap add-on that is available from "
-"https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a "
-"menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you "
-"can tick off. Now you can compose the message as you otherwise do (cut + "
-"paste, 'git format-patch' | 'git imap-send', etc), but you have to insert "
-"line breaks manually in any text that you type."
+#, priority:100
+msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
#: en/git-format-patch.txt:520
-#, no-wrap
+#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:522
+#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:526
-msgid ""
-"Configure your mail server composition as plain text: Edit...Account "
-"Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
+#, ignore-ellipsis, priority:100
+msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:528
+#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:531
-msgid ""
-"In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages "
-"at 0"
+#, priority:100
+msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:537
-msgid ""
-"In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for "
-"\"mail.wrap_long_lines\". Toggle it to make sure it is set to "
-"`false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
+#, priority:100
+msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:542
-msgid ""
-"Disable the use of format=flowed: Edit..Preferences..Advanced..Config "
-"Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make "
-"sure it is set to `false`."
+#, priority:100
+msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:546
-msgid ""
-"After that is done, you should be able to compose email as you otherwise "
-"would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the "
-"patches will not be mangled."
+#, priority:100
+msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
#: en/git-format-patch.txt:548
-#, no-wrap
+#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:553
-msgid ""
-"The following Thunderbird extensions are needed: AboutConfig from "
-"http://aboutconfig.mozdev.org/ and External Editor from "
-"http://globs.org/articles.php?lng=en&pg=8"
+#, priority:100
+msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:555
+#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:560
-msgid ""
-"Before opening a compose window, use Edit->Account Settings to uncheck the "
-"\"Compose messages in HTML format\" setting in the \"Composition & "
-"Addressing\" panel of the account to be used to send the patch."
+#, priority:100
+msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:564
-msgid ""
-"In the main Thunderbird window, 'before' you open the compose window for the "
-"patch, use Tools->about:config to set the following to the indicated values:"
+#, priority:100
+msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:568
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
"\tmailnews.wraplength => 0\n"
@@ -30053,26 +25544,25 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:571
+#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:574
-msgid ""
-"In the external editor window, read in the patch file and exit the editor "
-"normally."
+#, priority:100
+msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:577
-msgid ""
-"Side note: it may be possible to do step 2 with about:config and the "
-"following settings but no one's tried yet."
+#, priority:100
+msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:582
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
"\tmail.identity.default.compose_html => false\n"
@@ -30081,105 +25571,91 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:587
-msgid ""
-"There is a script in contrib/thunderbird-patch-inline which can help you "
-"include patches with Thunderbird in an easy way. To use it, do the steps "
-"above and then use the script as the external editor."
+#, priority:100
+msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
#: en/git-format-patch.txt:589
-#, no-wrap
+#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:591
+#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:593
+#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:595
+#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:598
-msgid ""
-"Go under \"Options\" in the Composer window and be sure that \"Word wrap\" "
-"is not set."
+#, priority:100
+msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:600
+#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:603
-msgid ""
-"Back in the compose window: add whatever other text you wish to the message, "
-"complete the addressing and subject fields, and press send."
+#, priority:100
+msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
#: en/git-format-patch.txt:605
-#, no-wrap
+#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:614
-msgid ""
-"The base tree information block is used for maintainers or third party "
-"testers to know the exact state the patch series applies to. It consists of "
-"the 'base commit', which is a well-known commit that is part of the stable "
-"part of the project history everybody else works off of, and zero or more "
-"'prerequisite patches', which are well-known patches in flight that is not "
-"yet part of the 'base commit' that need to be applied on top of 'base "
-"commit' in topological order before the patches can be applied."
+#, priority:100
+msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:620
-msgid ""
-"The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of "
-"the commit object name. A 'prerequisite patch' is shown as "
-"\"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be "
-"obtained by passing the patch through the `git patch-id --stable` command."
+#, priority:100
+msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:624
-msgid ""
-"Imagine that on top of the public commit P, you applied well-known patches "
-"X, Y and Z from somebody else, and then built your three-patch series A, B, "
-"C, the history would be like:"
+#, priority:100
+msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
#: en/git-format-patch.txt:627
-#, no-wrap
+#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:634
-msgid ""
-"With `git format-patch --base=P -3 C` (or variants thereof, e.g. with "
-"`--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), "
-"the base tree information block is shown at the end of the first message the "
-"command outputs (either the first patch, or the cover letter), like this:"
+#, priority:100
+msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:640
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
"prerequisite-patch-id: X\n"
@@ -30189,12 +25665,13 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:643
+#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
#: en/git-format-patch.txt:648
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
" \\ /\n"
@@ -30203,97 +25680,85 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:653
-msgid ""
-"You can also use `git format-patch --base=P -3 C` to generate patches for A, "
-"B and C, and the identifiers for P, X, Y, Z are appended at the end of the "
-"first message."
+#, priority:100
+msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:659
-msgid ""
-"If set `--base=auto` in cmdline, it will track base commit automatically, "
-"the base commit will be the merge base of tip commit of the remote-tracking "
-"branch and revision-range specified in cmdline. For a local branch, you "
-"need to track a remote branch by `git branch --set-upstream-to` before using "
-"this option."
+#, priority:100
+msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:665
-msgid ""
-"Extract commits between revisions R1 and R2, and apply them on top of the "
-"current branch using 'git am' to cherry-pick them:"
+#, priority:100
+msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:668
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:672
-msgid ""
-"Extract all commits which are in the current branch but not in the origin "
-"branch:"
+#, priority:100
+msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:675
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:678
+#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:681
-msgid ""
-"Extract all commits that lead to 'origin' since the inception of the "
-"project:"
+#, priority:100
+msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:684
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:687
+#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:690
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:697
-msgid ""
-"Additionally, it detects and handles renames and complete rewrites "
-"intelligently to produce a renaming patch. A renaming patch reduces the "
-"amount of text output, and generally makes it easier to review. Note that "
-"non-Git \"patch\" programs won't understand renaming patches, so use it only "
-"when you know the recipient uses Git to apply your patch."
+#, priority:100
+msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:700
-msgid ""
-"Extract three topmost commits from the current branch and format them as "
-"e-mailable patches:"
+#, priority:100
+msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:703
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
@@ -30305,52 +25770,43 @@ msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
#. type: Plain text
#: en/git-fsck-objects.txt:7
-#, fuzzy
-msgid ""
-"git-fsck-objects - Verifies the connectivity and validity of the objects in "
-"the database"
-msgstr ""
-"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
+#, fuzzy, priority:100
+msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
+msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos"
#. type: Plain text
#: en/git-fsck-objects.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git fsck-objects' ...\n"
msgstr ""
#. type: Plain text
#: en/git-fsck-objects.txt:19
-msgid ""
-"This is a synonym for linkgit:git-fsck[1]. Please refer to the "
-"documentation of that command."
+#, priority:100
+msgid "This is a synonym for linkgit:git-fsck[1]. Please refer to the documentation of that command."
msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-fsck(1)"
msgstr "git-fsck(1)"
#. type: Plain text
#: en/git-fsck.txt:7
-#, fuzzy
-msgid ""
-"git-fsck - Verifies the connectivity and validity of the objects in the "
-"database"
-msgstr ""
-"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
+#, fuzzy, priority:100
+msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
+msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos"
#. type: Plain text
#: en/git-fsck.txt:16
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
"\t [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
@@ -30360,664 +25816,537 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:25
+#, priority:100
msgid "An object to treat as the head of an unreachability trace."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:29
-msgid ""
-"If no objects are given, 'git fsck' defaults to using the index file, all "
-"SHA-1 references in `refs` namespace, and all reflogs (unless --no-reflogs "
-"is given) as heads."
+#, priority:100
+msgid "If no objects are given, 'git fsck' defaults to using the index file, all SHA-1 references in `refs` namespace, and all reflogs (unless --no-reflogs is given) as heads."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unreachable"
msgstr "--unreachable"
#. type: Plain text
#: en/git-fsck.txt:33
-msgid ""
-"Print out objects that exist but that aren't reachable from any of the "
-"reference nodes."
+#, priority:100
+msgid "Print out objects that exist but that aren't reachable from any of the reference nodes."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]dangling"
msgstr "--[no-]dangling"
#. type: Plain text
#: en/git-fsck.txt:37
-msgid ""
-"Print objects that exist but that are never 'directly' used (default). "
-"`--no-dangling` can be used to omit this information from the output."
+#, priority:100
+msgid "Print objects that exist but that are never 'directly' used (default). `--no-dangling` can be used to omit this information from the output."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:40
-#, fuzzy
+#, fuzzy, priority:100
msgid "Report root nodes."
msgstr "reportar nodos ra챠z"
#. type: Plain text
#: en/git-fsck.txt:43
-#, fuzzy
+#, fuzzy, priority:100
msgid "Report tags."
msgstr "reportar tags"
#. type: Labeled list
#: en/git-fsck.txt:44
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--cache"
msgstr "--cache"
#. type: Plain text
#: en/git-fsck.txt:47
-msgid ""
-"Consider any object recorded in the index also as a head node for an "
-"unreachability trace."
+#, priority:100
+msgid "Consider any object recorded in the index also as a head node for an unreachability trace."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-reflogs"
msgstr "--no-reflogs"
#. type: Plain text
#: en/git-fsck.txt:53
-msgid ""
-"Do not consider commits that are referenced only by an entry in a reflog to "
-"be reachable. This option is meant only to search for commits that used to "
-"be in a ref, but now aren't, but are still in that corresponding reflog."
+#, priority:100
+msgid "Do not consider commits that are referenced only by an entry in a reflog to be reachable. This option is meant only to search for commits that used to be in a ref, but now aren't, but are still in that corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--full"
msgstr "--full"
#. type: Plain text
#: en/git-fsck.txt:63
-msgid ""
-"Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also "
-"the ones found in alternate object pools listed in "
-"GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in "
-"packed Git archives found in $GIT_DIR/objects/pack and corresponding pack "
-"subdirectories in alternate object pools. This is now default; you can turn "
-"it off with --no-full."
+#, priority:100
+msgid "Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the ones found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in packed Git archives found in $GIT_DIR/objects/pack and corresponding pack subdirectories in alternate object pools. This is now default; you can turn it off with --no-full."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--connectivity-only"
msgstr "--connectivity-only"
#. type: Plain text
#: en/git-fsck.txt:72
-msgid ""
-"Check only the connectivity of reachable objects, making sure that any "
-"objects referenced by a reachable tag, commit, or tree is present. This "
-"speeds up the operation by avoiding reading blobs entirely (though it does "
-"still check that referenced blobs exist). This will detect corruption in "
-"commits and trees, but not do any semantic checks (e.g., for format "
-"errors). Corruption in blob objects will not be detected at all."
+#, priority:100
+msgid "Check only the connectivity of reachable objects, making sure that any objects referenced by a reachable tag, commit, or tree is present. This speeds up the operation by avoiding reading blobs entirely (though it does still check that referenced blobs exist). This will detect corruption in commits and trees, but not do any semantic checks (e.g., for format errors). Corruption in blob objects will not be detected at all."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:76
-msgid ""
-"Unreachable tags, commits, and trees will also be accessed to find the tips "
-"of dangling segments of history. Use `--no-dangling` if you don't care about "
-"this output and want to speed it up further."
+#, priority:100
+msgid "Unreachable tags, commits, and trees will also be accessed to find the tips of dangling segments of history. Use `--no-dangling` if you don't care about this output and want to speed it up further."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:77 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--strict"
msgstr "--strict"
#. type: Plain text
#: en/git-fsck.txt:84
-msgid ""
-"Enable more strict checking, namely to catch a file mode recorded with g+w "
-"bit set, which was created by older versions of Git. Existing repositories, "
-"including the Linux kernel, Git itself, and sparse repository have old "
-"objects that triggers this check, but it is recommended to check new "
-"projects with this flag."
+#, priority:100
+msgid "Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older versions of Git. Existing repositories, including the Linux kernel, Git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:87
+#, priority:100
msgid "Be chatty."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:88
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--lost-found"
msgstr "--lost-found"
#. type: Plain text
#: en/git-fsck.txt:93
-msgid ""
-"Write dangling objects into .git/lost-found/commit/ or "
-".git/lost-found/other/, depending on type. If the object is a blob, the "
-"contents are written into the file, rather than its object name."
+#, priority:100
+msgid "Write dangling objects into .git/lost-found/commit/ or .git/lost-found/other/, depending on type. If the object is a blob, the contents are written into the file, rather than its object name."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:94
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--name-objects"
msgstr "--name-objects"
#. type: Plain text
#: en/git-fsck.txt:99
-msgid ""
-"When displaying names of reachable objects, in addition to the SHA-1 also "
-"display a name that describes *how* they are reachable, compatible with "
-"linkgit:git-rev-parse[1], e.g. `HEAD@{1234567890}~25^2:src/`."
+#, priority:100
+msgid "When displaying names of reachable objects, in addition to the SHA-1 also display a name that describes *how* they are reachable, compatible with linkgit:git-rev-parse[1], e.g. `HEAD@{1234567890}~25^2:src/`."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:106
-msgid ""
-"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless --no-progress or --verbose is "
-"specified. --progress forces progress status even if the standard error "
-"stream is not directed to a terminal."
+#, priority:100
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --no-progress or --verbose is specified. --progress forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:121
-msgid ""
-"git-fsck tests SHA-1 and general object sanity, and it does full tracking of "
-"the resulting reachability and everything else. It prints out any corruption "
-"it finds (missing or bad objects), and if you use the `--unreachable` flag "
-"it will also print out objects that exist but that aren't reachable from any "
-"of the specified head nodes (or the default set, as mentioned above)."
+#, priority:100
+msgid "git-fsck tests SHA-1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the `--unreachable` flag it will also print out objects that exist but that aren't reachable from any of the specified head nodes (or the default set, as mentioned above)."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:125
-msgid ""
-"Any corrupt objects you will have to find in backups or other archives "
-"(i.e., you can just remove them and do an 'rsync' with some other site in "
-"the hopes that somebody else has the object you have corrupted)."
+#, priority:100
+msgid "Any corrupt objects you will have to find in backups or other archives (i.e., you can just remove them and do an 'rsync' with some other site in the hopes that somebody else has the object you have corrupted)."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:128
-msgid ""
-"If core.commitGraph is true, the commit-graph file will also be inspected "
-"using 'git commit-graph verify'. See linkgit:git-commit-graph[1]."
+#, priority:100
+msgid "If core.commitGraph is true, the commit-graph file will also be inspected using 'git commit-graph verify'. See linkgit:git-commit-graph[1]."
msgstr ""
#. type: Title -
#: en/git-fsck.txt:130
-#, no-wrap
+#, no-wrap, priority:100
msgid "Extracted Diagnostics"
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:132
-#, no-wrap
+#, no-wrap, priority:100
msgid "expect dangling commits - potential heads - due to lack of head information"
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:136
-msgid ""
-"You haven't specified any nodes as heads so it won't be possible to "
-"differentiate between un-parented commits and root nodes."
+#, priority:100
+msgid "You haven't specified any nodes as heads so it won't be possible to differentiate between un-parented commits and root nodes."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:137
-#, no-wrap
+#, no-wrap, priority:100
msgid "missing sha1 directory '<dir>'"
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:139
+#, priority:100
msgid "The directory holding the sha1 objects is missing."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:140
-#, no-wrap
+#, no-wrap, priority:100
msgid "unreachable <type> <object>"
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:147
-msgid ""
-"The <type> object <object>, isn't actually referred to directly or "
-"indirectly in any of the trees or commits seen. This can mean that there's "
-"another root node that you're not specifying or that the tree is corrupt. If "
-"you haven't missed a root node then you might as well delete unreachable "
-"nodes since they can't be used."
+#, priority:100
+msgid "The <type> object <object>, isn't actually referred to directly or indirectly in any of the trees or commits seen. This can mean that there's another root node that you're not specifying or that the tree is corrupt. If you haven't missed a root node then you might as well delete unreachable nodes since they can't be used."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:148
-#, no-wrap
+#, no-wrap, priority:100
msgid "missing <type> <object>"
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:151
-msgid ""
-"The <type> object <object>, is referred to but isn't present in the "
-"database."
+#, priority:100
+msgid "The <type> object <object>, is referred to but isn't present in the database."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:152
-#, no-wrap
+#, no-wrap, priority:100
msgid "dangling <type> <object>"
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:155
-msgid ""
-"The <type> object <object>, is present in the database but never 'directly' "
-"used. A dangling commit could be a root node."
+#, priority:100
+msgid "The <type> object <object>, is present in the database but never 'directly' used. A dangling commit could be a root node."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:156
-#, no-wrap
+#, no-wrap, priority:100
msgid "hash mismatch <object>"
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:160
-msgid ""
-"The database has an object whose hash doesn't match the object database "
-"value. This indicates a serious data integrity problem."
+#, priority:100
+msgid "The database has an object whose hash doesn't match the object database value. This indicates a serious data integrity problem."
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
-#, no-wrap
+#: en/git-fsck.txt:162 en/git.txt:408
+#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:164
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_OBJECT_DIRECTORY"
msgstr "GIT_OBJECT_DIRECTORY"
#. type: Plain text
#: en/git-fsck.txt:166
+#, priority:100
msgid "used to specify the object database root (usually $GIT_DIR/objects)"
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:167
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_INDEX_FILE"
msgstr "GIT_INDEX_FILE"
#. type: Plain text
#: en/git-fsck.txt:169
+#, priority:100
msgid "used to specify the index file of the index"
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:170
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
#. type: Plain text
#: en/git-fsck.txt:172
+#, priority:100
msgid "used to specify additional object database roots (usually unset)"
msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-gc(1)"
msgstr "git-gc(1)"
#. type: Plain text
#: en/git-gc.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
#. type: Plain text
#: en/git-gc.txt:13
-#, no-wrap
-msgid ""
-"'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] "
-"[--force] [--keep-largest-pack]\n"
+#, no-wrap, priority:100
+msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
msgstr ""
#. type: Plain text
#: en/git-gc.txt:22
-msgid ""
-"Runs a number of housekeeping tasks within the current repository, such as "
-"compressing file revisions (to reduce disk space and increase performance), "
-"removing unreachable objects which may have been created from prior "
-"invocations of 'git add', packing refs, pruning reflog, rerere metadata or "
-"stale working trees. May also update ancillary indexes such as the "
-"commit-graph."
+#, priority:100
+msgid "Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and increase performance), removing unreachable objects which may have been created from prior invocations of 'git add', packing refs, pruning reflog, rerere metadata or stale working trees. May also update ancillary indexes such as the commit-graph."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:27
-msgid ""
-"When common porcelain operations that create objects are run, they will "
-"check whether the repository has grown substantially since the last "
-"maintenance, and if so run `git gc` automatically. See `gc.auto` below for "
-"how to disable this behavior."
+#, priority:100
+msgid "When common porcelain operations that create objects are run, they will check whether the repository has grown substantially since the last maintenance, and if so run `git gc` automatically. See `gc.auto` below for how to disable this behavior."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:33
-msgid ""
-"Running `git gc` manually should only be needed when adding objects to a "
-"repository without regularly running such porcelain commands, to do a "
-"one-off repository optimization, or e.g. to clean up a suboptimal "
-"mass-import. See the \"PACKFILE OPTIMIZATION\" section in "
-"linkgit:git-fast-import[1] for more details on the import case."
+#, priority:100
+msgid "Running `git gc` manually should only be needed when adding objects to a repository without regularly running such porcelain commands, to do a one-off repository optimization, or e.g. to clean up a suboptimal mass-import. See the \"PACKFILE OPTIMIZATION\" section in linkgit:git-fast-import[1] for more details on the import case."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:37 en/git-read-tree.txt:72
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--aggressive"
msgstr "--aggressive"
#. type: Plain text
#: en/git-gc.txt:43
-msgid ""
-"Usually 'git gc' runs very quickly while providing good disk space "
-"utilization and performance. This option will cause 'git gc' to more "
-"aggressively optimize the repository at the expense of taking much more "
-"time. The effects of this optimization are mostly persistent. See the "
-"\"AGGRESSIVE\" section below for details."
+#, priority:100
+msgid "Usually 'git gc' runs very quickly while providing good disk space utilization and performance. This option will cause 'git gc' to more aggressively optimize the repository at the expense of taking much more time. The effects of this optimization are mostly persistent. See the \"AGGRESSIVE\" section below for details."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:44
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--auto"
msgstr "--auto"
#. type: Plain text
#: en/git-gc.txt:47
-msgid ""
-"With this option, 'git gc' checks whether any housekeeping is required; if "
-"not, it exits without performing any work."
+#, priority:100
+msgid "With this option, 'git gc' checks whether any housekeeping is required; if not, it exits without performing any work."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:50
-msgid ""
-"See the `gc.auto` option in the \"CONFIGURATION\" section below for how this "
-"heuristic works."
+#, priority:100
+msgid "See the `gc.auto` option in the \"CONFIGURATION\" section below for how this heuristic works."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:55
-msgid ""
-"Once housekeeping is triggered by exceeding the limits of configuration "
-"options such as `gc.auto` and `gc.autoPackLimit`, all other housekeeping "
-"tasks (e.g. rerere, working trees, reflog...) will be performed as well."
+#, ignore-ellipsis, priority:100
+msgid "Once housekeeping is triggered by exceeding the limits of configuration options such as `gc.auto` and `gc.autoPackLimit`, all other housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed as well."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:57
-#, no-wrap
+#, no-wrap, priority:100
msgid "--prune=<date>"
msgstr ""
#. type: Plain text
#: en/git-gc.txt:64
-msgid ""
-"Prune loose objects older than date (default is 2 weeks ago, overridable by "
-"the config variable `gc.pruneExpire`). --prune=now prunes loose objects "
-"regardless of their age and increases the risk of corruption if another "
-"process is writing to the repository concurrently; see \"NOTES\" "
-"below. --prune is on by default."
+#, priority:100
+msgid "Prune loose objects older than date (default is 2 weeks ago, overridable by the config variable `gc.pruneExpire`). --prune=now prunes loose objects regardless of their age and increases the risk of corruption if another process is writing to the repository concurrently; see \"NOTES\" below. --prune is on by default."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:65 en/git-pack-refs.txt:57
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-prune"
msgstr "--no-prune"
#. type: Plain text
#: en/git-gc.txt:67
+#, priority:100
msgid "Do not prune any loose objects."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:70
+#, priority:100
msgid "Suppress all progress reports."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:74
-msgid ""
-"Force `git gc` to run even if there may be another `git gc` instance running "
-"on this repository."
+#, priority:100
+msgid "Force `git gc` to run even if there may be another `git gc` instance running on this repository."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:75
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-largest-pack"
msgstr "--keep-largest-pack"
#. type: Plain text
#: en/git-gc.txt:79
-msgid ""
-"All packs except the largest pack and those marked with a `.keep` files are "
-"consolidated into a single pack. When this option is used, "
-"`gc.bigPackThreshold` is ignored."
+#, priority:100
+msgid "All packs except the largest pack and those marked with a `.keep` files are consolidated into a single pack. When this option is used, `gc.bigPackThreshold` is ignored."
msgstr ""
#. type: Title -
#: en/git-gc.txt:81
-#, no-wrap
+#, no-wrap, priority:100
msgid "AGGRESSIVE"
msgstr ""
#. type: Plain text
#: en/git-gc.txt:88
-msgid ""
-"When the `--aggressive` option is supplied, linkgit:git-repack[1] will be "
-"invoked with the `-f` flag, which in turn will pass `--no-reuse-delta` to "
-"linkgit:git-pack-objects[1]. This will throw away any existing deltas and "
-"re-compute them, at the expense of spending much more time on the repacking."
+#, priority:100
+msgid "When the `--aggressive` option is supplied, linkgit:git-repack[1] will be invoked with the `-f` flag, which in turn will pass `--no-reuse-delta` to linkgit:git-pack-objects[1]. This will throw away any existing deltas and re-compute them, at the expense of spending much more time on the repacking."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:93
-msgid ""
-"The effects of this are mostly persistent, e.g. when packs and loose objects "
-"are coalesced into one another pack the existing deltas in that pack might "
-"get re-used, but there are also various cases where we might pick a "
-"sub-optimal delta from a newer pack instead."
+#, priority:100
+msgid "The effects of this are mostly persistent, e.g. when packs and loose objects are coalesced into one another pack the existing deltas in that pack might get re-used, but there are also various cases where we might pick a sub-optimal delta from a newer pack instead."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:99
-msgid ""
-"Furthermore, supplying `--aggressive` will tweak the `--depth` and "
-"`--window` options passed to linkgit:git-repack[1]. See the "
-"`gc.aggressiveDepth` and `gc.aggressiveWindow` settings below. By using a "
-"larger window size we're more likely to find more optimal deltas."
+#, priority:100
+msgid "Furthermore, supplying `--aggressive` will tweak the `--depth` and `--window` options passed to linkgit:git-repack[1]. See the `gc.aggressiveDepth` and `gc.aggressiveWindow` settings below. By using a larger window size we're more likely to find more optimal deltas."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:105
-msgid ""
-"It's probably not worth it to use this option on a given repository without "
-"running tailored performance benchmarks on it. It takes a lot more time, and "
-"the resulting space/delta optimization may or may not be worth it. Not using "
-"this at all is the right trade-off for most users and their repositories."
+#, priority:100
+msgid "It's probably not worth it to use this option on a given repository without running tailored performance benchmarks on it. It takes a lot more time, and the resulting space/delta optimization may or may not be worth it. Not using this at all is the right trade-off for most users and their repositories."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:111
-msgid ""
-"The below documentation is the same as what's found in "
-"linkgit:git-config[1]:"
+#, priority:100
+msgid "The below documentation is the same as what's found in linkgit:git-config[1]:"
msgstr ""
#. type: Plain text
#: en/git-gc.txt:126
-msgid ""
-"'git gc' tries very hard not to delete objects that are referenced anywhere "
-"in your repository. In particular, it will keep not only objects referenced "
-"by your current set of branches and tags, but also objects referenced by the "
-"index, remote-tracking branches, notes saved by 'git notes' under "
-"refs/notes/, reflogs (which may reference commits in branches that were "
-"later amended or rewound), and anything else in the refs/* namespace. If "
-"you are expecting some objects to be deleted and they aren't, check all of "
-"those locations and decide whether it makes sense in your case to remove "
-"those references."
+#, priority:100
+msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:133
-msgid ""
-"On the other hand, when 'git gc' runs concurrently with another process, "
-"there is a risk of it deleting an object that the other process is using but "
-"hasn't created a reference to. This may just cause the other process to fail "
-"or may corrupt the repository if the other process later adds a reference to "
-"the deleted object. Git has two features that significantly mitigate this "
-"problem:"
+#, priority:100
+msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
#: en/git-gc.txt:136
-msgid ""
-"Any object with modification time newer than the `--prune` date is kept, "
-"along with everything reachable from it."
+#, priority:100
+msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:140
-msgid ""
-"Most operations that add an object to the database update the modification "
-"time of the object if it is already present so that #1 applies."
+#, priority:100
+msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:144
-msgid ""
-"However, these features fall short of a complete solution, so users who run "
-"commands concurrently have to live with some risk of corruption (which seems "
-"to be low in practice)."
+#, priority:100
+msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:150
-msgid ""
-"The 'git gc --auto' command will run the 'pre-auto-gc' hook. See "
-"linkgit:githooks[5] for more information."
+#, priority:100
+msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:158
#, ignore-same, priority:100
-msgid ""
-"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] "
-"linkgit:git-rerere[1]"
-msgstr ""
-"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-"
-"rerere[1]"
+msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
+msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-get-tar-commit-id(1)"
msgstr "git-get-tar-commit-id(1)"
#. type: Plain text
#: en/git-get-tar-commit-id.txt:7
-msgid ""
-"git-get-tar-commit-id - Extract commit ID from an archive created using "
-"git-archive"
+#, priority:100
+msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
msgstr ""
#. type: Plain text
#: en/git-get-tar-commit-id.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'git get-tar-commit-id'\n"
msgstr "git-get-tar-commit-id(1)"
#. type: Plain text
#: en/git-get-tar-commit-id.txt:22
-msgid ""
-"Read a tar archive created by 'git archive' from the standard input and "
-"extract the commit ID stored in it. It reads only the first 1024 bytes of "
-"input, thus its runtime is not influenced by the size of the tar archive "
-"very much."
+#, priority:100
+msgid "Read a tar archive created by 'git archive' from the standard input and extract the commit ID stored in it. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of the tar archive very much."
msgstr ""
#. type: Plain text
#: en/git-get-tar-commit-id.txt:27
-msgid ""
-"If no commit ID is found, 'git get-tar-commit-id' quietly exists with a "
-"return code of 1. This can happen if the archive had not been created using "
-"'git archive' or if the first parameter of 'git archive' had been a tree ID "
-"instead of a commit ID or tag."
+#, priority:100
+msgid "If no commit ID is found, 'git get-tar-commit-id' quietly exists with a return code of 1. This can happen if the archive had not been created using 'git archive' or if the first parameter of 'git archive' had been a tree ID instead of a commit ID or tag."
msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-grep(1)"
msgstr "git-grep(1)"
#. type: Plain text
#: en/git-grep.txt:7
+#, priority:100
msgid "git-grep - Print lines matching a pattern"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:32
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | "
-"--word-regexp]\n"
+"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]\n"
"\t [-v | --invert-match] [-h|-H] [--full-name]\n"
"\t [-E | --extended-regexp] [-G | --basic-regexp]\n"
"\t [-P | --perl-regexp]\n"
@@ -31035,1176 +26364,1065 @@ msgid ""
"\t [-f <file>] [-e] <pattern>\n"
"\t [--and|--or|--not|(|)|-e <pattern>...]\n"
"\t [--recurse-submodules] [--parent-basename <basename>]\n"
-"\t [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | "
-"<tree>...]\n"
+"\t [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | <tree>...]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:39
-msgid ""
-"Look for specified patterns in the tracked files in the work tree, blobs "
-"registered in the index file, or blobs in given tree objects. Patterns are "
-"lists of one or more search expressions separated by newline characters. An "
-"empty string as search expression matches all lines."
+#, priority:100
+msgid "Look for specified patterns in the tracked files in the work tree, blobs registered in the index file, or blobs in given tree objects. Patterns are lists of one or more search expressions separated by newline characters. An empty string as search expression matches all lines."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "grep.lineNumber"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:46
+#, priority:100
msgid "If set to true, enable `-n` option by default."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:47
-#, no-wrap
+#, no-wrap, priority:100
msgid "grep.column"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:49
+#, priority:100
msgid "If set to true, enable the `--column` option by default."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:50
-#, no-wrap
+#, no-wrap, priority:100
msgid "grep.patternType"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:55
-msgid ""
-"Set the default matching behavior. Using a value of 'basic', 'extended', "
-"'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, "
-"`--fixed-strings`, or `--perl-regexp` option accordingly, while the value "
-"'default' will return to the default matching behavior."
+#, priority:100
+msgid "Set the default matching behavior. Using a value of 'basic', 'extended', 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--fixed-strings`, or `--perl-regexp` option accordingly, while the value 'default' will return to the default matching behavior."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:56
-#, no-wrap
+#, no-wrap, priority:100
msgid "grep.extendedRegexp"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:60
-msgid ""
-"If set to true, enable `--extended-regexp` option by default. This option is "
-"ignored when the `grep.patternType` option is set to a value other than "
-"'default'."
+#, priority:100
+msgid "If set to true, enable `--extended-regexp` option by default. This option is ignored when the `grep.patternType` option is set to a value other than 'default'."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:61
-#, no-wrap
+#, no-wrap, priority:100
msgid "grep.threads"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
-msgid ""
-"Number of grep worker threads to use. If unset (or set to 0), 8 threads are "
-"used by default (for now)."
+#, priority:100
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:65
-#, no-wrap
+#, no-wrap, priority:100
msgid "grep.fullName"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:67
+#, priority:100
msgid "If set to true, enable `--full-name` option by default."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:68
-#, no-wrap
+#, no-wrap, priority:100
msgid "grep.fallbackToNoIndex"
msgstr ""
#. type: Plain text
#: en/git-grep.txt:71
-msgid ""
-"If set to true, fall back to git grep --no-index if git grep is executed "
-"outside of a git repository. Defaults to false."
+#, priority:100
+msgid "If set to true, fall back to git grep --no-index if git grep is executed outside of a git repository. Defaults to false."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:78
-msgid ""
-"Instead of searching tracked files in the working tree, search blobs "
-"registered in the index file."
+#, priority:100
+msgid "Instead of searching tracked files in the working tree, search blobs registered in the index file."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:81
+#, priority:100
msgid "Search files in the current directory that is not managed by Git."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:82
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--untracked"
msgstr "--untracked"
#. type: Plain text
#: en/git-grep.txt:85
-msgid ""
-"In addition to searching in the tracked files in the working tree, search "
-"also in untracked files."
+#, priority:100
+msgid "In addition to searching in the tracked files in the working tree, search also in untracked files."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:86
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-exclude-standard"
msgstr "--no-exclude-standard"
#. type: Plain text
#: en/git-grep.txt:89
-msgid ""
-"Also search in ignored files by not honoring the `.gitignore` "
-"mechanism. Only useful with `--untracked`."
+#, priority:100
+msgid "Also search in ignored files by not honoring the `.gitignore` mechanism. Only useful with `--untracked`."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:90 en/git-ls-files.txt:98
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--exclude-standard"
msgstr "--exclude-standard"
#. type: Plain text
#: en/git-grep.txt:94
-msgid ""
-"Do not pay attention to ignored files specified via the `.gitignore` "
-"mechanism. Only useful when searching files in the current directory with "
-"`--no-index`."
+#, priority:100
+msgid "Do not pay attention to ignored files specified via the `.gitignore` mechanism. Only useful when searching files in the current directory with `--no-index`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
-msgid ""
-"Recursively search in each submodule that has been initialized and checked "
-"out in the repository. When used in combination with the <tree> option the "
-"prefix of all submodule output will be the name of the parent project's "
-"<tree> object."
+#: en/git-grep.txt:101
+#, priority:100
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
+#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
+#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
+#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
+#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
-#, no-wrap
+#: en/git-grep.txt:118
+#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
-#, fuzzy
+#: en/git-grep.txt:120
+#, fuzzy, priority:100
msgid "Don't match the pattern in binary files."
msgstr "no concordar patrones en archivos binarios"
#. type: Labeled list
-#: en/git-grep.txt:120
-#, no-wrap
+#: en/git-grep.txt:121
+#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
-msgid ""
-"For each <pathspec> given on command line, descend at most <depth> levels of "
-"directories. A value of -1 means no limit. This option is ignored if "
-"<pathspec> contains active wildcards. In other words if \"a*\" matches a "
-"directory named \"a*\", \"*\" is matched literally so --max-depth is still "
-"effective."
+#: en/git-grep.txt:127
+#, priority:100
+msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
-#, no-wrap
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
+#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
-#, no-wrap
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
+#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
-#, no-wrap
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
-msgid ""
-"Match the pattern only at word boundary (either begin at the beginning of a "
-"line, or preceded by a non-word character; end at the end of a line or "
-"followed by a non-word character)."
+#: en/git-grep.txt:140
+#, priority:100
+msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
-#, no-wrap
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
+#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
-msgid ""
-"By default, the command shows the filename for each match. `-h` option is "
-"used to suppress this output. `-H` is there for completeness and does not "
-"do anything except it overrides `-h` given earlier on the command line."
+#: en/git-grep.txt:152
+#, priority:100
+msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
-#, no-wrap
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
-msgid ""
-"When run from a subdirectory, the command usually outputs paths relative to "
-"the current directory. This option forces paths to be output relative to "
-"the project top directory."
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
+#, priority:100
+msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
-#, no-wrap
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
+#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
-#, no-wrap
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
-#, no-wrap
+#: en/git-grep.txt:161
+#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
-#, no-wrap
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
-msgid ""
-"Use POSIX extended/basic regexp for patterns. Default is to use basic "
-"regexp."
+#: en/git-grep.txt:165
+#, priority:100
+msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
-#, no-wrap
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
+#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
-msgid ""
-"Support for these types of regular expressions is an optional compile-time "
-"dependency. If Git wasn't compiled with support for them providing this "
-"option will cause it to die."
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
+#, priority:260
+msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
-#, no-wrap
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
+#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
-#, no-wrap
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
+#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
-#, no-wrap
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
+#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
-#, no-wrap
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
-msgid ""
-"Prefix the 1-indexed byte-offset of the first match from the start of the "
-"matching line."
+#: en/git-grep.txt:186
+#, priority:100
+msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
-#, no-wrap
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
-#, no-wrap
+#: en/git-grep.txt:190
+#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
-#, no-wrap
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
-msgid ""
-"Instead of showing every matched line, show only the names of files that "
-"contain (or do not contain) matches. For better compatibility with 'git "
-"diff', `--name-only` is a synonym for `--files-with-matches`."
+#: en/git-grep.txt:196
+#, priority:100
+msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
-#, no-wrap
+#: en/git-grep.txt:197
+#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
-#, no-wrap
+#: en/git-grep.txt:198
+#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
-msgid ""
-"Open the matching files in the pager (not the output of 'grep'). If the "
-"pager happens to be \"less\" or \"vi\", and the user specified only one "
-"pattern, the first file is positioned at the first match automatically. The "
-"`pager` argument is optional; if specified, it must be stuck to the option "
-"without a space. If `pager` is unspecified, the default pager will be used "
-"(see `core.pager` in linkgit:git-config[1])."
+#: en/git-grep.txt:206
+#, priority:100
+msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
+#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
-#, no-wrap
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
-msgid ""
-"Print only the matched (non-empty) parts of a matching line, with each such "
-"part on a separate output line."
+#: en/git-grep.txt:216
+#, priority:100
+msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
-#, no-wrap
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
+#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
-msgid ""
-"Show colored matches. The value must be always (the default), never, or "
-"auto."
+#: en/git-grep.txt:225
+#, priority:100
+msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
-msgid ""
-"Turn off match highlighting, even when the configuration file gives the "
-"default to color output. Same as `--color=never`."
+#: en/git-grep.txt:230
+#, priority:100
+msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
-#, no-wrap
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
-#, fuzzy
+#: en/git-grep.txt:233
+#, fuzzy, priority:100
msgid "Print an empty line between matches from different files."
msgstr "imprimir una l챠nea vac챠a entre coincidencias de diferentes archivos"
#. type: Labeled list
-#: en/git-grep.txt:233
-#, no-wrap
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
-msgid ""
-"Show the filename above the matches in that file instead of at the start of "
-"each shown line."
+#: en/git-grep.txt:237
+#, priority:100
+msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
-#, no-wrap
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
-msgid ""
-"Show the preceding line that contains the function name of the match, unless "
-"the matching line is a function name itself. The name is determined in the "
-"same way as 'git diff' works out patch hunk headers (see 'Defining a custom "
-"hunk-header' in linkgit:gitattributes[5])."
+#: en/git-grep.txt:245
+#, priority:100
+msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
-#, no-wrap
+#: en/git-grep.txt:246
+#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
-#, no-wrap
+#: en/git-grep.txt:247
+#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
-#, no-wrap
+#: en/git-grep.txt:248
+#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
-msgid ""
-"Show <num> leading and trailing lines, and place a line containing `--` "
-"between contiguous groups of matches."
+#: en/git-grep.txt:251
+#, priority:100
+msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
-#, no-wrap
+#: en/git-grep.txt:252
+#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
-#, no-wrap
+#: en/git-grep.txt:253
+#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
-msgid ""
-"Show <num> trailing lines, and place a line containing `--` between "
-"contiguous groups of matches."
+#: en/git-grep.txt:256
+#, priority:100
+msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
-#, no-wrap
+#: en/git-grep.txt:257
+#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
-#, no-wrap
+#: en/git-grep.txt:258
+#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
-msgid ""
-"Show <num> leading lines, and place a line containing `--` between "
-"contiguous groups of matches."
+#: en/git-grep.txt:261
+#, priority:100
+msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
-msgid ""
-"Show the surrounding text from the previous line containing a function name "
-"up to the one before the next function name, effectively showing the whole "
-"function in which the match was found."
+#: en/git-grep.txt:268
+#, priority:100
+msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
-#, no-wrap
+#: en/git-grep.txt:269
+#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
-msgid ""
-"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' "
-"for more information."
+#: en/git-grep.txt:272
+#, priority:100
+msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
-#, no-wrap
+#: en/git-grep.txt:273
+#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
+#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
-msgid ""
-"Passing the pattern via <file> allows for providing a search pattern "
-"containing a \\0."
+#: en/git-grep.txt:278
+#, priority:100
+msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
-msgid ""
-"Not all pattern types support patterns containing \\0. Git will error out if "
-"a given pattern type can't support such a pattern. The `--perl-regexp` "
-"pattern type when compiled against the PCRE v2 backend has the widest "
-"support for these types of patterns."
+#: en/git-grep.txt:283
+#, priority:100
+msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
-msgid ""
-"In versions of Git before 2.23.0 patterns containing \\0 would be silently "
-"considered fixed. This was never documented, there were also odd and "
-"undocumented interactions between e.g. non-ASCII patterns containing \\0 and "
-"`--ignore-case`."
+#: en/git-grep.txt:288
+#, priority:100
+msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
-msgid ""
-"In future versions we may learn to support patterns containing \\0 for more "
-"search backends, until then we'll die when the pattern type in question "
-"doesn't support them."
+#: en/git-grep.txt:292
+#, priority:100
+msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
-msgid ""
-"The next parameter is the pattern. This option has to be used for patterns "
-"starting with `-` and should be used in scripts passing user input to grep. "
-"Multiple patterns are combined by 'or'."
+#: en/git-grep.txt:298
+#, priority:100
+msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
-#, no-wrap
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
-#, no-wrap
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
-#, no-wrap
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
-#, no-wrap
+#: en/git-grep.txt:302
+#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
-msgid ""
-"Specify how multiple patterns are combined using Boolean expressions. "
-"`--or` is the default operator. `--and` has higher precedence than `--or`. "
-"`-e` has to be used for all patterns."
+#: en/git-grep.txt:307
+#, priority:100
+msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
-#, no-wrap
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
-msgid ""
-"When giving multiple pattern expressions combined with `--or`, this flag is "
-"specified to limit the match to files that have lines to match all of them."
+#: en/git-grep.txt:312
+#, priority:100
+msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
-msgid ""
-"Do not output matched lines; instead, exit with status 0 when there is a "
-"match and with non-zero status when there isn't."
+#: en/git-grep.txt:317
+#, priority:100
+msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
-#, no-wrap
+#: en/git-grep.txt:318
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
-msgid ""
-"Instead of searching tracked files in the working tree, search blobs in the "
-"given trees."
+#: en/git-grep.txt:321
+#, priority:100
+msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
-msgid ""
-"Signals the end of options; the rest of the parameters are <pathspec> "
-"limiters."
+#: en/git-grep.txt:325
+#, priority:100
+msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
-msgid ""
-"If given, limit the search to paths matching at least one pattern. Both "
-"leading paths match and glob(7) patterns are supported."
+#: en/git-grep.txt:329
+#, priority:100
+msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
-#, no-wrap
+#: en/git-grep.txt:336
+#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
-msgid ""
-"Looks for `time_t` in all tracked .c and .h files in the working directory "
-"and its subdirectories."
+#: en/git-grep.txt:339
+#, priority:100
+msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
-#, no-wrap
+#: en/git-grep.txt:340
+#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
+#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
-#, no-wrap
+#: en/git-grep.txt:344
+#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
-msgid ""
-"Looks for a line that has `NODE` or `Unexpected` in files that have lines "
-"that match both."
+#: en/git-grep.txt:347
+#, priority:100
+msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
-#, no-wrap
+#: en/git-grep.txt:348
+#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
+#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-gui(1)"
msgstr "git-gui(1)"
#. type: Plain text
#: en/git-gui.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-gui - A portable graphical interface to Git"
msgstr "Una interfaz gr찼fica port찼til para Git"
#. type: Plain text
#: en/git-gui.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git gui' [<command>] [arguments]\n"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:19
-msgid ""
-"A Tcl/Tk based graphical user interface to Git. 'git gui' focuses on "
-"allowing users to make changes to their repository by making new commits, "
-"amending existing ones, creating branches, performing local merges, and "
-"fetching/pushing to remote repositories."
+#, priority:100
+msgid "A Tcl/Tk based graphical user interface to Git. 'git gui' focuses on allowing users to make changes to their repository by making new commits, amending existing ones, creating branches, performing local merges, and fetching/pushing to remote repositories."
msgstr ""
#. type: Plain text
#: en/git-gui.txt:24
-msgid ""
-"Unlike 'gitk', 'git gui' focuses on commit generation and single file "
-"annotation and does not show project history. It does however supply menu "
-"actions to start a 'gitk' session from within 'git gui'."
+#, priority:100
+msgid "Unlike 'gitk', 'git gui' focuses on commit generation and single file annotation and does not show project history. It does however supply menu actions to start a 'gitk' session from within 'git gui'."
msgstr ""
#. type: Plain text
#: en/git-gui.txt:29
-msgid ""
-"'git gui' is known to work on all popular UNIX systems, Mac OS X, and "
-"Windows (under both Cygwin and MSYS). To the extent possible OS specific "
-"user interface guidelines are followed, making 'git gui' a fairly native "
-"interface for users."
+#, priority:100
+msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Windows (under both Cygwin and MSYS). To the extent possible OS specific user interface guidelines are followed, making 'git gui' a fairly native interface for users."
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
-#, no-wrap
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:32
-#, no-wrap
+#, no-wrap, priority:100
msgid "blame"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:35
-msgid ""
-"Start a blame viewer on the specified file on the given version (or working "
-"directory if not specified)."
+#, priority:100
+msgid "Start a blame viewer on the specified file on the given version (or working directory if not specified)."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:36
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "browser"
msgstr "--browser"
#. type: Plain text
#: en/git-gui.txt:40
-msgid ""
-"Start a tree browser showing all files in the specified commit. Files "
-"selected through the browser are opened in the blame viewer."
+#, priority:100
+msgid "Start a tree browser showing all files in the specified commit. Files selected through the browser are opened in the blame viewer."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:41
-#, no-wrap
+#, no-wrap, priority:100
msgid "citool"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:46
-msgid ""
-"Start 'git gui' and arrange to make exactly one commit before exiting and "
-"returning to the shell. The interface is limited to only commit actions, "
-"slightly reducing the application's startup time and simplifying the "
-"menubar."
+#, priority:100
+msgid "Start 'git gui' and arrange to make exactly one commit before exiting and returning to the shell. The interface is limited to only commit actions, slightly reducing the application's startup time and simplifying the menubar."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:47
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "version"
msgstr "--version"
#. type: Plain text
#: en/git-gui.txt:49
+#, priority:100
msgid "Display the currently running version of 'git gui'."
msgstr ""
#. type: Title -
#: en/git-gui.txt:52 en/git-imap-send.txt:63 en/git-whatchanged.txt:29
-#, no-wrap
+#, no-wrap, priority:100
msgid "Examples"
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:53
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git gui blame Makefile`"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:61
-msgid ""
-"Show the contents of the file 'Makefile' in the current working directory, "
-"and provide annotations for both the original author of each line, and who "
-"moved the line to its current location. The uncommitted file is annotated, "
-"and uncommitted changes (if any) are explicitly attributed to 'Not Yet "
-"Committed'."
+#, priority:100
+msgid "Show the contents of the file 'Makefile' in the current working directory, and provide annotations for both the original author of each line, and who moved the line to its current location. The uncommitted file is annotated, and uncommitted changes (if any) are explicitly attributed to 'Not Yet Committed'."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:62
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git gui blame v0.99.8 Makefile`"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:68
-msgid ""
-"Show the contents of 'Makefile' in revision 'v0.99.8' and provide "
-"annotations for each line. Unlike the above example the file is read from "
-"the object database and not the working directory."
+#, priority:100
+msgid "Show the contents of 'Makefile' in revision 'v0.99.8' and provide annotations for each line. Unlike the above example the file is read from the object database and not the working directory."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:69
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git gui blame --line=100 Makefile`"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:73
-msgid ""
-"Loads annotations as described above and automatically scrolls the view to "
-"center on line '100'."
+#, priority:100
+msgid "Loads annotations as described above and automatically scrolls the view to center on line '100'."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:74
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git gui citool`"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:79
-msgid ""
-"Make one commit and return to the shell when it is complete. This command "
-"returns a non-zero exit code if the window was closed in any way other than "
-"by making a commit."
+#, priority:100
+msgid "Make one commit and return to the shell when it is complete. This command returns a non-zero exit code if the window was closed in any way other than by making a commit."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:80
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git gui citool --amend`"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:84
+#, priority:100
msgid "Automatically enter the 'Amend Last Commit' mode of the interface."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:85
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git gui citool --nocommit`"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:91
-msgid ""
-"Behave as normal citool, but instead of making a commit simply terminate "
-"with a zero exit code. It still checks that the index does not contain any "
-"unmerged entries, so you can use it as a GUI version of "
-"linkgit:git-mergetool[1]"
+#, priority:100
+msgid "Behave as normal citool, but instead of making a commit simply terminate with a zero exit code. It still checks that the index does not contain any unmerged entries, so you can use it as a GUI version of linkgit:git-mergetool[1]"
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:92
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git citool`"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:95
+#, priority:100
msgid "Same as `git gui citool` (above)."
msgstr ""
#. type: Labeled list
#: en/git-gui.txt:96
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git gui browser maint`"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:101
-msgid ""
-"Show a browser for the tree of the 'maint' branch. Files selected in the "
-"browser can be viewed with the internal blame viewer."
+#, priority:100
+msgid "Show a browser for the tree of the 'maint' branch. Files selected in the browser can be viewed with the internal blame viewer."
msgstr ""
#. type: Plain text
#: en/git-gui.txt:108
-msgid ""
-"The Git repository browser. Shows branches, commit history and file "
-"differences. gitk is the utility started by 'git gui''s Repository "
-"Visualize actions."
+#, priority:100
+msgid "The Git repository browser. Shows branches, commit history and file differences. gitk is the utility started by 'git gui''s Repository Visualize actions."
msgstr ""
#. type: Title -
#: en/git-gui.txt:110
-#, no-wrap
+#, no-wrap, priority:100
msgid "Other"
msgstr "Otro"
#. type: Plain text
#: en/git-gui.txt:114
-msgid ""
-"'git gui' is actually maintained as an independent project, but stable "
-"versions are distributed as part of the Git suite for the convenience of end "
-"users."
+#, priority:100
+msgid "'git gui' is actually maintained as an independent project, but stable versions are distributed as part of the Git suite for the convenience of end users."
msgstr ""
#. type: Plain text
#: en/git-gui.txt:116
+#, priority:100
msgid "The official repository of the 'git gui' project can be found at:"
msgstr ""
#. type: Plain text
#: en/git-gui.txt:118
-#, no-wrap
+#, no-wrap, priority:100
msgid " https://github.com/prati0100/git-gui.git/\n"
msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-hash-object(1)"
msgstr "git-hash-object(1)"
#. type: Plain text
#: en/git-hash-object.txt:7
-#, fuzzy
-msgid ""
-"git-hash-object - Compute object ID and optionally creates a blob from a "
-"file"
+#, fuzzy, priority:100
+msgid "git-hash-object - Compute object ID and optionally creates a blob from a file"
msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
#. type: Plain text
#: en/git-hash-object.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin "
-"[--literally]] [--] <file>...\n"
+"'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...\n"
"'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters]\n"
msgstr ""
#. type: Plain text
#: en/git-hash-object.txt:22
-msgid ""
-"Computes the object ID value for an object with specified type with the "
-"contents of the named file (which can be outside of the work tree), and "
-"optionally writes the resulting object into the object database. Reports "
-"its object ID to its standard output. When <type> is not specified, it "
-"defaults to \"blob\"."
+#, priority:100
+msgid "Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. When <type> is not specified, it defaults to \"blob\"."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:26
-#, no-wrap
+#, no-wrap, priority:100
msgid "-t <type>"
msgstr ""
#. type: Plain text
#: en/git-hash-object.txt:28
+#, priority:100
msgid "Specify the type (default: \"blob\")."
msgstr ""
#. type: Plain text
#: en/git-hash-object.txt:31
-#, fuzzy
+#, fuzzy, priority:100
msgid "Actually write the object into the object database."
msgstr "escribir el objeto en la base de datos de objetos"
#. type: Plain text
#: en/git-hash-object.txt:34
+#, priority:100
msgid "Read the object from standard input instead of from a file."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:35
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stdin-paths"
msgstr "--stdin-paths"
#. type: Plain text
#: en/git-hash-object.txt:38
-msgid ""
-"Read file names from the standard input, one per line, instead of from the "
-"command-line."
+#, priority:100
+msgid "Read file names from the standard input, one per line, instead of from the command-line."
msgstr ""
#. type: Plain text
#: en/git-hash-object.txt:48
-msgid ""
-"Hash object as it were located at the given path. The location of file does "
-"not directly influence on the hash value, but path is used to determine what "
-"Git filters should be applied to the object before it can be placed to the "
-"object database, and, as result of applying filters, the actual blob put "
-"into the object database may differ from the given file. This option is "
-"mainly useful for hashing temporary files located outside of the working "
-"directory or files read from stdin."
+#, priority:100
+msgid "Hash object as it were located at the given path. The location of file does not directly influence on the hash value, but path is used to determine what Git filters should be applied to the object before it can be placed to the object database, and, as result of applying filters, the actual blob put into the object database may differ from the given file. This option is mainly useful for hashing temporary files located outside of the working directory or files read from stdin."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:49
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-filters"
msgstr "--no-filters"
#. type: Plain text
#: en/git-hash-object.txt:54
-msgid ""
-"Hash the contents as is, ignoring any input filter that would have been "
-"chosen by the attributes mechanism, including the end-of-line conversion. If "
-"the file is read from standard input then this is always implied, unless the "
-"`--path` option is given."
+#, priority:100
+msgid "Hash the contents as is, ignoring any input filter that would have been chosen by the attributes mechanism, including the end-of-line conversion. If the file is read from standard input then this is always implied, unless the `--path` option is given."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:55
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--literally"
msgstr "--literally"
#. type: Plain text
#: en/git-hash-object.txt:60
-msgid ""
-"Allow `--stdin` to hash any garbage into a loose object which might not "
-"otherwise pass standard object parsing or git-fsck checks. Useful for "
-"stress-testing Git itself or reproducing characteristics of corrupt or bogus "
-"objects encountered in the wild."
+#, priority:100
+msgid "Allow `--stdin` to hash any garbage into a loose object which might not otherwise pass standard object parsing or git-fsck checks. Useful for stress-testing Git itself or reproducing characteristics of corrupt or bogus objects encountered in the wild."
msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-help(1)"
msgstr "git-help(1)"
#. type: Plain text
#: en/git-help.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-help - Display help information about Git"
msgstr "Mostrar informaci처n sobre Git"
#. type: Plain text
#: en/git-help.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git help' [-a|--all [--[no-]verbose]] [-g|--guide]\n"
"\t [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]\n"
@@ -32212,268 +27430,235 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:20
-msgid ""
-"With no options and no COMMAND or GUIDE given, the synopsis of the 'git' "
-"command and a list of the most commonly used Git commands are printed on the "
-"standard output."
+#, priority:100
+msgid "With no options and no COMMAND or GUIDE given, the synopsis of the 'git' command and a list of the most commonly used Git commands are printed on the standard output."
msgstr ""
#. type: Plain text
#: en/git-help.txt:23
-msgid ""
-"If the option `--all` or `-a` is given, all available commands are printed "
-"on the standard output."
+#, priority:100
+msgid "If the option `--all` or `-a` is given, all available commands are printed on the standard output."
msgstr ""
#. type: Plain text
#: en/git-help.txt:26
-msgid ""
-"If the option `--guide` or `-g` is given, a list of the useful Git guides is "
-"also printed on the standard output."
+#, priority:100
+msgid "If the option `--guide` or `-g` is given, a list of the useful Git guides is also printed on the standard output."
msgstr ""
#. type: Plain text
#: en/git-help.txt:31
-msgid ""
-"If a command, or a guide, is given, a manual page for that command or guide "
-"is brought up. The 'man' program is used by default for this purpose, but "
-"this can be overridden by other options or configuration variables."
+#, priority:100
+msgid "If a command, or a guide, is given, a manual page for that command or guide is brought up. The 'man' program is used by default for this purpose, but this can be overridden by other options or configuration variables."
msgstr ""
#. type: Plain text
#: en/git-help.txt:35
-msgid ""
-"If an alias is given, git shows the definition of the alias on standard "
-"output. To get the manual page for the aliased command, use `git COMMAND "
-"--help`."
+#, priority:100
+msgid "If an alias is given, git shows the definition of the alias on standard output. To get the manual page for the aliased command, use `git COMMAND --help`."
msgstr ""
#. type: Plain text
#: en/git-help.txt:38
-msgid ""
-"Note that `git --help ...` is identical to `git help ...` because the former "
-"is internally converted into the latter."
+#, ignore-ellipsis, priority:100
+msgid "Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter."
msgstr ""
#. type: Plain text
#: en/git-help.txt:40
+#, priority:100
msgid "To display the linkgit:git[1] man page, use `git help git`."
msgstr ""
#. type: Plain text
#: en/git-help.txt:42
+#, priority:100
msgid "This page can be displayed with 'git help help' or `git help --help`"
msgstr ""
#. type: Plain text
#: en/git-help.txt:49
-msgid ""
-"Prints all the available commands on the standard output. This option "
-"overrides any given command or guide name."
+#, priority:100
+msgid "Prints all the available commands on the standard output. This option overrides any given command or guide name."
msgstr ""
#. type: Plain text
#: en/git-help.txt:53
-msgid ""
-"When used with `--all` print description for all recognized commands. This "
-"is the default."
+#, priority:100
+msgid "When used with `--all` print description for all recognized commands. This is the default."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:55
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--config"
msgstr "--config"
#. type: Plain text
#: en/git-help.txt:58
-msgid ""
-"List all available configuration variables. This is a short summary of the "
-"list in linkgit:git-config[1]."
+#, priority:100
+msgid "List all available configuration variables. This is a short summary of the list in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--guides"
msgstr "--guides"
#. type: Plain text
#: en/git-help.txt:63
-msgid ""
-"Prints a list of useful guides on the standard output. This option overrides "
-"any given command or guide name."
+#, priority:100
+msgid "Prints a list of useful guides on the standard output. This option overrides any given command or guide name."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:65
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--info"
msgstr "--info"
#. type: Plain text
#: en/git-help.txt:68
-msgid ""
-"Display manual page for the command in the 'info' format. The 'info' program "
-"will be used for that purpose."
+#, priority:100
+msgid "Display manual page for the command in the 'info' format. The 'info' program will be used for that purpose."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:70
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--man"
msgstr "--man"
#. type: Plain text
#: en/git-help.txt:74
-msgid ""
-"Display manual page for the command in the 'man' format. This option may be "
-"used to override a value set in the `help.format` configuration variable."
+#, priority:100
+msgid "Display manual page for the command in the 'man' format. This option may be used to override a value set in the `help.format` configuration variable."
msgstr ""
#. type: Plain text
#: en/git-help.txt:78
-msgid ""
-"By default the 'man' program will be used to display the manual page, but "
-"the `man.viewer` configuration variable may be used to choose other display "
-"programs (see below)."
+#, priority:100
+msgid "By default the 'man' program will be used to display the manual page, but the `man.viewer` configuration variable may be used to choose other display programs (see below)."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:80
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--web"
msgstr "--web"
#. type: Plain text
#: en/git-help.txt:83
-msgid ""
-"Display manual page for the command in the 'web' (HTML) format. A web "
-"browser will be used for that purpose."
+#, priority:100
+msgid "Display manual page for the command in the 'web' (HTML) format. A web browser will be used for that purpose."
msgstr ""
#. type: Plain text
#: en/git-help.txt:89
-msgid ""
-"The web browser can be specified using the configuration variable "
-"`help.browser`, or `web.browser` if the former is not set. If none of these "
-"config variables is set, the 'git web{litdd}browse' helper script (called by "
-"'git help') will pick a suitable default. See "
-"linkgit:git-web{litdd}browse[1] for more information about this."
+#, priority:100
+msgid "The web browser can be specified using the configuration variable `help.browser`, or `web.browser` if the former is not set. If none of these config variables is set, the 'git web{litdd}browse' helper script (called by 'git help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for more information about this."
msgstr ""
#. type: Title -
#: en/git-help.txt:91 en/git-interpret-trailers.txt:135 en/git-p4.txt:515 en/git-web--browse.txt:59
-#, no-wrap
+#, no-wrap, priority:100
msgid "CONFIGURATION VARIABLES"
msgstr ""
#. type: Title ~
#: en/git-help.txt:94
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "help.format"
msgstr "help.format"
#. type: Plain text
#: en/git-help.txt:100
-msgid ""
-"If no command-line option is passed, the `help.format` configuration "
-"variable will be checked. The following values are supported for this "
-"variable; they make 'git help' behave as their corresponding command- line "
-"option:"
+#, priority:100
+msgid "If no command-line option is passed, the `help.format` configuration variable will be checked. The following values are supported for this variable; they make 'git help' behave as their corresponding command- line option:"
msgstr ""
#. type: Plain text
#: en/git-help.txt:102
+#, priority:100
msgid "\"man\" corresponds to '-m|--man',"
msgstr ""
#. type: Plain text
#: en/git-help.txt:103
+#, priority:100
msgid "\"info\" corresponds to '-i|--info',"
msgstr ""
#. type: Plain text
#: en/git-help.txt:104
+#, priority:100
msgid "\"web\" or \"html\" correspond to '-w|--web'."
msgstr ""
#. type: Title ~
#: en/git-help.txt:106
-#, no-wrap
+#, no-wrap, priority:100
msgid "help.browser, web.browser and browser.<tool>.path"
msgstr ""
#. type: Plain text
#: en/git-help.txt:112
-msgid ""
-"The `help.browser`, `web.browser` and `browser.<tool>.path` will also be "
-"checked if the 'web' format is chosen (either by command-line option or "
-"configuration variable). See '-w|--web' in the OPTIONS section above and "
-"linkgit:git-web{litdd}browse[1]."
+#, priority:100
+msgid "The `help.browser`, `web.browser` and `browser.<tool>.path` will also be checked if the 'web' format is chosen (either by command-line option or configuration variable). See '-w|--web' in the OPTIONS section above and linkgit:git-web{litdd}browse[1]."
msgstr ""
#. type: Title ~
#: en/git-help.txt:114
-#, no-wrap
+#, no-wrap, priority:100
msgid "man.viewer"
msgstr ""
#. type: Plain text
#: en/git-help.txt:118
-msgid ""
-"The `man.viewer` configuration variable will be checked if the 'man' format "
-"is chosen. The following values are currently supported:"
+#, priority:100
+msgid "The `man.viewer` configuration variable will be checked if the 'man' format is chosen. The following values are currently supported:"
msgstr ""
#. type: Plain text
#: en/git-help.txt:120
+#, priority:100
msgid "\"man\": use the 'man' program as usual,"
msgstr ""
#. type: Plain text
#: en/git-help.txt:122
-msgid ""
-"\"woman\": use 'emacsclient' to launch the \"woman\" mode in emacs (this "
-"only works starting with emacsclient versions 22),"
+#, priority:100
+msgid "\"woman\": use 'emacsclient' to launch the \"woman\" mode in emacs (this only works starting with emacsclient versions 22),"
msgstr ""
#. type: Plain text
#: en/git-help.txt:124
-msgid ""
-"\"konqueror\": use 'kfmclient' to open the man page in a new konqueror tab "
-"(see 'Note about konqueror' below)."
+#, priority:100
+msgid "\"konqueror\": use 'kfmclient' to open the man page in a new konqueror tab (see 'Note about konqueror' below)."
msgstr ""
#. type: Plain text
#: en/git-help.txt:127
-msgid ""
-"Values for other tools can be used if there is a corresponding "
-"`man.<tool>.cmd` configuration entry (see below)."
+#, priority:100
+msgid "Values for other tools can be used if there is a corresponding `man.<tool>.cmd` configuration entry (see below)."
msgstr ""
#. type: Plain text
#: en/git-help.txt:131
-msgid ""
-"Multiple values may be given to the `man.viewer` configuration "
-"variable. Their corresponding programs will be tried in the order listed in "
-"the configuration file."
+#, priority:100
+msgid "Multiple values may be given to the `man.viewer` configuration variable. Their corresponding programs will be tried in the order listed in the configuration file."
msgstr ""
#. type: Plain text
#: en/git-help.txt:133
+#, priority:100
msgid "For example, this configuration:"
msgstr ""
#. type: delimited block -
#: en/git-help.txt:138
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t[man]\n"
"\t\tviewer = konqueror\n"
@@ -32482,83 +27667,67 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:142
-msgid ""
-"will try to use konqueror first. But this may fail (for example, if DISPLAY "
-"is not set) and in that case emacs' woman mode will be tried."
+#, priority:100
+msgid "will try to use konqueror first. But this may fail (for example, if DISPLAY is not set) and in that case emacs' woman mode will be tried."
msgstr ""
#. type: Plain text
#: en/git-help.txt:146
-msgid ""
-"If everything fails, or if no viewer is configured, the viewer specified in "
-"the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too, "
-"the 'man' program will be tried anyway."
+#, priority:100
+msgid "If everything fails, or if no viewer is configured, the viewer specified in the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too, the 'man' program will be tried anyway."
msgstr ""
#. type: Title ~
#: en/git-help.txt:148
-#, no-wrap
+#, no-wrap, priority:100
msgid "man.<tool>.path"
msgstr ""
#. type: Plain text
#: en/git-help.txt:155
-msgid ""
-"You can explicitly provide a full path to your preferred man viewer by "
-"setting the configuration variable `man.<tool>.path`. For example, you can "
-"configure the absolute path to konqueror by setting "
-"'man.konqueror.path'. Otherwise, 'git help' assumes the tool is available in "
-"PATH."
+#, priority:100
+msgid "You can explicitly provide a full path to your preferred man viewer by setting the configuration variable `man.<tool>.path`. For example, you can configure the absolute path to konqueror by setting 'man.konqueror.path'. Otherwise, 'git help' assumes the tool is available in PATH."
msgstr ""
#. type: Title ~
#: en/git-help.txt:157
-#, no-wrap
+#, no-wrap, priority:100
msgid "man.<tool>.cmd"
msgstr ""
#. type: Plain text
#: en/git-help.txt:165
-msgid ""
-"When the man viewer, specified by the `man.viewer` configuration variables, "
-"is not among the supported ones, then the corresponding `man.<tool>.cmd` "
-"configuration variable will be looked up. If this variable exists then the "
-"specified tool will be treated as a custom command and a shell eval will be "
-"used to run the command with the man page passed as arguments."
+#, priority:100
+msgid "When the man viewer, specified by the `man.viewer` configuration variables, is not among the supported ones, then the corresponding `man.<tool>.cmd` configuration variable will be looked up. If this variable exists then the specified tool will be treated as a custom command and a shell eval will be used to run the command with the man page passed as arguments."
msgstr ""
#. type: Title ~
#: en/git-help.txt:167
-#, no-wrap
+#, no-wrap, priority:100
msgid "Note about konqueror"
msgstr ""
#. type: Plain text
#: en/git-help.txt:172
-msgid ""
-"When 'konqueror' is specified in the `man.viewer` configuration variable, we "
-"launch 'kfmclient' to try to open the man page on an already opened "
-"konqueror in a new tab if possible."
+#, priority:100
+msgid "When 'konqueror' is specified in the `man.viewer` configuration variable, we launch 'kfmclient' to try to open the man page on an already opened konqueror in a new tab if possible."
msgstr ""
#. type: Plain text
#: en/git-help.txt:176
-msgid ""
-"For consistency, we also try such a trick if 'man.konqueror.path' is set to "
-"something like `A_PATH_TO/konqueror`. That means we will try to launch "
-"`A_PATH_TO/kfmclient` instead."
+#, priority:100
+msgid "For consistency, we also try such a trick if 'man.konqueror.path' is set to something like `A_PATH_TO/konqueror`. That means we will try to launch `A_PATH_TO/kfmclient` instead."
msgstr ""
#. type: Plain text
#: en/git-help.txt:179 en/git-web--browse.txt:100
-msgid ""
-"If you really want to use 'konqueror', then you can use something like the "
-"following:"
+#, priority:100
+msgid "If you really want to use 'konqueror', then you can use something like the following:"
msgstr ""
#. type: delimited block -
#: en/git-help.txt:183
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t[man]\n"
"\t\tviewer = konq\n"
@@ -32566,7 +27735,7 @@ msgstr ""
#. type: delimited block -
#: en/git-help.txt:186
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t[man \"konq\"]\n"
"\t\tcmd = A_PATH_TO/konqueror\n"
@@ -32574,20 +27743,19 @@ msgstr ""
#. type: Title ~
#: en/git-help.txt:189
-#, no-wrap
+#, no-wrap, priority:100
msgid "Note about git config --global"
msgstr ""
#. type: Plain text
#: en/git-help.txt:193
-msgid ""
-"Note that all these configuration variables should probably be set using the "
-"`--global` flag, for example like this:"
+#, priority:100
+msgid "Note that all these configuration variables should probably be set using the `--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
#: en/git-help.txt:197
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git config --global help.format web\n"
"$ git config --global web.browser firefox\n"
@@ -32595,150 +27763,121 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:201 en/git-web--browse.txt:121
-msgid ""
-"as they are probably more user specific than repository specific. See "
-"linkgit:git-config[1] for more information about this."
+#, priority:100
+msgid "as they are probably more user specific than repository specific. See linkgit:git-config[1] for more information about this."
msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-http-backend(1)"
msgstr "git-http-backend(1)"
#. type: Plain text
#: en/git-http-backend.txt:7
+#, priority:100
msgid "git-http-backend - Server side implementation of Git over HTTP"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git http-backend'\n"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:20
-msgid ""
-"A simple CGI program to serve the contents of a Git repository to Git "
-"clients accessing the repository over http:// and https:// protocols. The "
-"program supports clients fetching using both the smart HTTP protocol and the "
-"backwards-compatible dumb HTTP protocol, as well as clients pushing using "
-"the smart HTTP protocol."
+#, priority:100
+msgid "A simple CGI program to serve the contents of a Git repository to Git clients accessing the repository over http:// and https:// protocols. The program supports clients fetching using both the smart HTTP protocol and the backwards-compatible dumb HTTP protocol, as well as clients pushing using the smart HTTP protocol."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:25
-msgid ""
-"It verifies that the directory has the magic file \"git-daemon-export-ok\", "
-"and it will refuse to export any Git directory that hasn't explicitly been "
-"marked for export this way (unless the `GIT_HTTP_EXPORT_ALL` environmental "
-"variable is set)."
+#, priority:100
+msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `GIT_HTTP_EXPORT_ALL` environmental variable is set)."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:31
-msgid ""
-"By default, only the `upload-pack` service is enabled, which serves 'git "
-"fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', "
-"'git pull', and 'git clone'. If the client is authenticated, the "
-"`receive-pack` service is enabled, which serves 'git send-pack' clients, "
-"which is invoked from 'git push'."
+#, priority:100
+msgid "By default, only the `upload-pack` service is enabled, which serves 'git fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', 'git pull', and 'git clone'. If the client is authenticated, the `receive-pack` service is enabled, which serves 'git send-pack' clients, which is invoked from 'git push'."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:36
-msgid ""
-"These services can be enabled/disabled using the per-repository "
-"configuration file:"
+#, priority:100
+msgid "These services can be enabled/disabled using the per-repository configuration file:"
msgstr ""
#. type: Labeled list
#: en/git-http-backend.txt:37
-#, no-wrap
+#, no-wrap, priority:100
msgid "http.getanyfile"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:44
-msgid ""
-"This serves Git clients older than version 1.6.6 that are unable to use the "
-"upload pack service. When enabled, clients are able to read any file within "
-"the repository, including objects that are no longer reachable from a branch "
-"but are still present. It is enabled by default, but a repository can "
-"disable it by setting this configuration item to `false`."
+#, priority:100
+msgid "This serves Git clients older than version 1.6.6 that are unable to use the upload pack service. When enabled, clients are able to read any file within the repository, including objects that are no longer reachable from a branch but are still present. It is enabled by default, but a repository can disable it by setting this configuration item to `false`."
msgstr ""
#. type: Labeled list
#: en/git-http-backend.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "http.uploadpack"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:49
-msgid ""
-"This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by "
-"default, but a repository can disable it by setting this configuration item "
-"to `false`."
+#, priority:100
+msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting this configuration item to `false`."
msgstr ""
#. type: Labeled list
#: en/git-http-backend.txt:50
-#, no-wrap
+#, no-wrap, priority:100
msgid "http.receivepack"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:56
-msgid ""
-"This serves 'git send-pack' clients, allowing push. It is disabled by "
-"default for anonymous users, and enabled by default for users authenticated "
-"by the web server. It can be disabled by setting this item to `false`, or "
-"enabled for all users, including anonymous users, by setting it to `true`."
+#, priority:100
+msgid "This serves 'git send-pack' clients, allowing push. It is disabled by default for anonymous users, and enabled by default for users authenticated by the web server. It can be disabled by setting this item to `false`, or enabled for all users, including anonymous users, by setting it to `true`."
msgstr ""
#. type: Title -
#: en/git-http-backend.txt:58
-#, no-wrap
+#, no-wrap, priority:100
msgid "URL TRANSLATION"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:65
-msgid ""
-"To determine the location of the repository on disk, 'git http-backend' "
-"concatenates the environment variables PATH_INFO, which is set automatically "
-"by the web server, and GIT_PROJECT_ROOT, which must be set manually in the "
-"web server configuration. If GIT_PROJECT_ROOT is not set, 'git "
-"http-backend' reads PATH_TRANSLATED, which is also set automatically by the "
-"web server."
+#, priority:100
+msgid "To determine the location of the repository on disk, 'git http-backend' concatenates the environment variables PATH_INFO, which is set automatically by the web server, and GIT_PROJECT_ROOT, which must be set manually in the web server configuration. If GIT_PROJECT_ROOT is not set, 'git http-backend' reads PATH_TRANSLATED, which is also set automatically by the web server."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:70
-msgid ""
-"All of the following examples map `http://$hostname/git/foo/bar.git` to "
-"`/var/www/git/foo/bar.git`."
+#, priority:100
+msgid "All of the following examples map `http://$hostname/git/foo/bar.git` to `/var/www/git/foo/bar.git`."
msgstr ""
#. type: Labeled list
#: en/git-http-backend.txt:71
-#, no-wrap
+#, no-wrap, priority:100
msgid "Apache 2.x"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:75
-msgid ""
-"Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or "
-"DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
+#, priority:100
+msgid "Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:80
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"SetEnv GIT_PROJECT_ROOT /var/www/git\n"
"SetEnv GIT_HTTP_EXPORT_ALL\n"
@@ -32747,16 +27886,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:86
-msgid ""
-"To enable anonymous read access but authenticated write access, require "
-"authorization for both the initial ref advertisement (which we detect as a "
-"push via the service parameter in the query string), and the receive-pack "
-"invocation itself:"
+#, priority:100
+msgid "To enable anonymous read access but authenticated write access, require authorization for both the initial ref advertisement (which we detect as a push via the service parameter in the query string), and the receive-pack invocation itself:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:91
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]\n"
"RewriteCond %{REQUEST_URI} /git-receive-pack$\n"
@@ -32765,7 +27901,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:95
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"<LocationMatch \"^/git/\">\n"
"\tOrder Deny,Allow\n"
@@ -32774,7 +27910,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:102
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\tAuthType Basic\n"
"\tAuthName \"Git Access\"\n"
@@ -32786,14 +27922,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:107
-msgid ""
-"If you do not have `mod_rewrite` available to match against the query "
-"string, it is sufficient to just protect `git-receive-pack` itself, like:"
+#, priority:100
+msgid "If you do not have `mod_rewrite` available to match against the query string, it is sufficient to just protect `git-receive-pack` itself, like:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:115
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"<LocationMatch \"^/git/.*/git-receive-pack$\">\n"
"\tAuthType Basic\n"
@@ -32805,27 +27940,19 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:125
-msgid ""
-"In this mode, the server will not request authentication until the client "
-"actually starts the object negotiation phase of the push, rather than during "
-"the initial contact. For this reason, you must also enable the "
-"`http.receivepack` config option in any repositories that should accept a "
-"push. The default behavior, if `http.receivepack` is not set, is to reject "
-"any pushes by unauthenticated users; the initial request will therefore "
-"report `403 Forbidden` to the client, without even giving an opportunity for "
-"authentication."
+#, priority:100
+msgid "In this mode, the server will not request authentication until the client actually starts the object negotiation phase of the push, rather than during the initial contact. For this reason, you must also enable the `http.receivepack` config option in any repositories that should accept a push. The default behavior, if `http.receivepack` is not set, is to reject any pushes by unauthenticated users; the initial request will therefore report `403 Forbidden` to the client, without even giving an opportunity for authentication."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:128
-msgid ""
-"To require authentication for both reads and writes, use a Location "
-"directive around the repository, or one of its parent directories:"
+#, priority:100
+msgid "To require authentication for both reads and writes, use a Location directive around the repository, or one of its parent directories:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:136
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"<Location /git/private>\n"
"\tAuthType Basic\n"
@@ -32837,14 +27964,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:141
-msgid ""
-"To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs "
-"that 'git http-backend' can handle, and forward the rest to gitweb:"
+#, priority:100
+msgid "To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs that 'git http-backend' can handle, and forward the rest to gitweb:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:151
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"ScriptAliasMatch \\\n"
"\t\"(?x)^/git/(.*/(HEAD | \\\n"
@@ -32858,71 +27984,63 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:153
-#, no-wrap
+#, no-wrap, priority:100
msgid "ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:157
-msgid ""
-"To serve multiple repositories from different linkgit:gitnamespaces[7] in a "
-"single repository:"
+#, priority:100
+msgid "To serve multiple repositories from different linkgit:gitnamespaces[7] in a single repository:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:161
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"SetEnvIf Request_URI \"^/git/([^/]*)\" GIT_NAMESPACE=$1\n"
-"ScriptAliasMatch ^/git/[^/]*(.*) "
-"/usr/libexec/git-core/git-http-backend/storage.git$1\n"
+"ScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/storage.git$1\n"
msgstr ""
#. type: Labeled list
#: en/git-http-backend.txt:163
-#, no-wrap
+#, no-wrap, priority:100
msgid "Accelerated static Apache 2.x"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:168
-msgid ""
-"Similar to the above, but Apache can be used to return static files that are "
-"stored on disk. On many systems this may be more efficient as Apache can "
-"ask the kernel to copy the file contents from the file system directly to "
-"the network:"
+#, priority:100
+msgid "Similar to the above, but Apache can be used to return static files that are stored on disk. On many systems this may be more efficient as Apache can ask the kernel to copy the file contents from the file system directly to the network:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:171 en/git-http-backend.txt:181
-#, no-wrap
+#, no-wrap, priority:100
msgid "SetEnv GIT_PROJECT_ROOT /var/www/git\n"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:175
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
-"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ "
-"/var/www/git/$1\n"
-"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ "
-"/var/www/git/$1\n"
+"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/www/git/$1\n"
+"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\n"
"ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/\n"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:178
+#, priority:100
msgid "This can be combined with the gitweb configuration:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:191
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
-"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ "
-"/var/www/git/$1\n"
-"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ "
-"/var/www/git/$1\n"
+"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/www/git/$1\n"
+"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\n"
"ScriptAliasMatch \\\n"
"\t\"(?x)^/git/(.*/(HEAD | \\\n"
"\t\t\tinfo/refs | \\\n"
@@ -32934,21 +28052,19 @@ msgstr ""
#. type: Labeled list
#: en/git-http-backend.txt:193
-#, no-wrap
+#, no-wrap, priority:100
msgid "Lighttpd"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:197
-msgid ""
-"Ensure that `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` are loaded, "
-"then set `GIT_PROJECT_ROOT` appropriately and redirect all requests to the "
-"CGI:"
+#, priority:100
+msgid "Ensure that `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` are loaded, then set `GIT_PROJECT_ROOT` appropriately and redirect all requests to the CGI:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:207
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"alias.url += ( \"/git\" => \"/usr/lib/git-core/git-http-backend\" )\n"
"$HTTP[\"url\"] =~ \"^/git\" {\n"
@@ -32962,12 +28078,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:210
+#, priority:100
msgid "To enable anonymous read access but authenticated write access:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:218
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$HTTP[\"querystring\"] =~ \"service=git-receive-pack\" {\n"
"\tinclude \"git-auth.conf\"\n"
@@ -32979,12 +28096,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:221
+#, priority:100
msgid "where `git-auth.conf` looks something like:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:231
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"auth.require = (\n"
"\t\"/\" => (\n"
@@ -32998,12 +28116,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:234
+#, priority:100
msgid "To require authentication for both reads and writes:"
msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:239
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$HTTP[\"url\"] =~ \"^/git/private\" {\n"
"\tinclude \"git-auth.conf\"\n"
@@ -33012,207 +28131,193 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:246
-msgid ""
-"'git http-backend' relies upon the `CGI` environment variables set by the "
-"invoking web server, including:"
+#, priority:100
+msgid "'git http-backend' relies upon the `CGI` environment variables set by the invoking web server, including:"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:248
+#, priority:100
msgid "PATH_INFO (if GIT_PROJECT_ROOT is set, otherwise PATH_TRANSLATED)"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:249
+#, priority:100
msgid "REMOTE_USER"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:250
+#, priority:100
msgid "REMOTE_ADDR"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:251
+#, priority:100
msgid "CONTENT_TYPE"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:252
+#, priority:100
msgid "QUERY_STRING"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:253
+#, priority:100
msgid "REQUEST_METHOD"
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:257
-msgid ""
-"The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to "
-"'git-http-backend' to bypass the check for the \"git-daemon-export-ok\" file "
-"in each repository before allowing export of that repository."
+#, priority:100
+msgid "The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to 'git-http-backend' to bypass the check for the \"git-daemon-export-ok\" file in each repository before allowing export of that repository."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:266
-msgid ""
-"The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the "
-"`http.maxRequestBuffer` config variable) may be set to change the largest "
-"ref negotiation request that git will handle during a fetch; any fetch "
-"requiring a larger buffer will not succeed. This value should not normally "
-"need to be changed, but may be helpful if you are fetching from a repository "
-"with an extremely large number of refs. The value can be specified with a "
-"unit (e.g., `100M` for 100 megabytes). The default is 10 megabytes."
+#, priority:100
+msgid "The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the `http.maxRequestBuffer` config variable) may be set to change the largest ref negotiation request that git will handle during a fetch; any fetch requiring a larger buffer will not succeed. This value should not normally need to be changed, but may be helpful if you are fetching from a repository with an extremely large number of refs. The value can be specified with a unit (e.g., `100M` for 100 megabytes). The default is 10 megabytes."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:271
-msgid ""
-"The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and "
-"GIT_COMMITTER_EMAIL to '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', ensuring "
-"that any reflogs created by 'git-receive-pack' contain some identifying "
-"information of the remote user who performed the push."
+#, priority:100
+msgid "The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and GIT_COMMITTER_EMAIL to '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', ensuring that any reflogs created by 'git-receive-pack' contain some identifying information of the remote user who performed the push."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:274
-msgid ""
-"All `CGI` environment variables are available to each of the hooks invoked "
-"by the 'git-receive-pack'."
+#, priority:100
+msgid "All `CGI` environment variables are available to each of the hooks invoked by the 'git-receive-pack'."
msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-http-fetch(1)"
msgstr "git-http-fetch(1)"
#. type: Plain text
#: en/git-http-fetch.txt:7
+#, priority:100
msgid "git-http-fetch - Download from a remote Git repository via HTTP"
msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:13
-#, no-wrap
-msgid ""
-"'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] "
-"[--stdin] <commit> <url>\n"
+#, no-wrap, priority:100
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:17
-#, fuzzy
+#, fuzzy, priority:100
msgid "Downloads a remote Git repository via HTTP."
msgstr "Descarga de un repositorio Git remoto v챠a HTTP"
#. type: Plain text
#: en/git-http-fetch.txt:21
-msgid ""
-"This command always gets all objects. Historically, there were three options "
-"`-a`, `-c` and `-t` for choosing which objects to download. They are now "
-"silently ignored."
+#, priority:100
+msgid "This command always gets all objects. Historically, there were three options `-a`, `-c` and `-t` for choosing which objects to download. They are now silently ignored."
msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:24
-#, no-wrap
+#, no-wrap, priority:100
msgid "commit-id"
msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:27
+#, priority:100
msgid "Either the hash or the filename under [URL]/refs/ to pull."
msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:28
-#, no-wrap
+#, no-wrap, priority:100
msgid "-a, -c, -t"
msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:30
+#, priority:100
msgid "These options are ignored for historical reasons."
msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:32
+#, priority:100
msgid "Report what is downloaded."
msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:33
-#, no-wrap
+#, no-wrap, priority:100
msgid "-w <filename>"
msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:36
-msgid ""
-"Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the "
-"local end after the transfer is complete."
+#, priority:100
+msgid "Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete."
msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:40
-msgid ""
-"Instead of a commit id on the command line (which is not expected in this "
-"case), 'git http-fetch' expects lines on stdin in the format"
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' expects lines on stdin in the format"
msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:42
-#, no-wrap
+#, no-wrap, priority:100
msgid "<commit-id>['\\t'<filename-as-in--w>]\n"
msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:43
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--recover"
msgstr "--recover"
#. type: Plain text
#: en/git-http-fetch.txt:46
-msgid ""
-"Verify that everything reachable from target is fetched. Used after an "
-"earlier fetch is interrupted."
+#, priority:100
+msgid "Verify that everything reachable from target is fetched. Used after an earlier fetch is interrupted."
msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-http-push(1)"
msgstr "git-http-push(1)"
#. type: Plain text
#: en/git-http-push.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-http-push - Push objects over HTTP/DAV to another repository"
msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
#. type: Plain text
#: en/git-http-push.txt:13
-#, no-wrap
-msgid ""
-"'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> "
-"[<ref>...]\n"
+#, ignore-ellipsis, no-wrap, priority:100
+msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:18
+#, priority:100
msgid "Sends missing objects to remote repository, and updates the remote branch."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:22
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"*NOTE*: This command is temporarily disabled if your libcurl\n"
"is older than 7.16, as the combination has been reported\n"
@@ -33221,240 +28326,220 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:29
-msgid ""
-"Do not assume that the remote repository is complete in its current state, "
-"and verify all objects in the entire local ref's history exist in the remote "
-"repository."
+#, priority:100
+msgid "Do not assume that the remote repository is complete in its current state, and verify all objects in the entire local ref's history exist in the remote repository."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:36 en/git-send-pack.txt:60
-msgid ""
-"Usually, the command refuses to update a remote ref that is not an ancestor "
-"of the local ref used to overwrite it. This flag disables the check. What "
-"this means is that the remote repository can lose commits; use it with care."
+#, priority:100
+msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:39 en/git-push.txt:175 en/git-send-pack.txt:53
+#, priority:220
msgid "Do everything except actually send the updates."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:43
-msgid ""
-"Report the list of objects being walked locally and the list of objects "
-"successfully sent to the remote repository."
+#, priority:100
+msgid "Report the list of objects being walked locally and the list of objects successfully sent to the remote repository."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:49
-msgid ""
-"Remove <ref> from remote repository. The specified branch cannot be the "
-"remote HEAD. If -d is specified the following other conditions must also be "
-"met:"
+#, priority:100
+msgid "Remove <ref> from remote repository. The specified branch cannot be the remote HEAD. If -d is specified the following other conditions must also be met:"
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:51
+#, priority:100
msgid "Remote HEAD must resolve to an object that exists locally"
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:52
+#, priority:100
msgid "Specified branch resolves to an object that exists locally"
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:53
+#, priority:100
msgid "Specified branch is an ancestor of the remote HEAD"
msgstr ""
#. type: Labeled list
#: en/git-http-push.txt:54 en/git-send-pack.txt:98
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<ref>..."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:56 en/git-send-pack.txt:100
+#, priority:100
msgid "The remote refs to update."
msgstr ""
#. type: Title -
#: en/git-http-push.txt:59 en/git-send-pack.txt:103
-#, no-wrap
+#, no-wrap, priority:100
msgid "SPECIFYING THE REFS"
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:65
-msgid ""
-"A '<ref>' specification can be either a single pattern, or a pair of such "
-"patterns separated by a colon \":\" (this means that a ref name cannot have "
-"a colon in it). A single pattern '<name>' is just a shorthand for "
-"'<name>:<name>'."
+#, priority:100
+msgid "A '<ref>' specification can be either a single pattern, or a pair of such patterns separated by a colon \":\" (this means that a ref name cannot have a colon in it). A single pattern '<name>' is just a shorthand for '<name>:<name>'."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:71
-msgid ""
-"Each pattern pair consists of the source side (before the colon) and the "
-"destination side (after the colon). The ref to be pushed is determined by "
-"finding a match that matches the source side, and where it is pushed is "
-"determined by using the destination side."
+#, priority:100
+msgid "Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:74 en/git-send-pack.txt:131
+#, priority:100
msgid "It is an error if <src> does not match exactly one of the local refs."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:76 en/git-send-pack.txt:135
+#, priority:100
msgid "If <dst> does not match any remote ref, either"
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:79 en/git-send-pack.txt:138
-msgid ""
-"it has to start with \"refs/\"; <dst> is used as the destination literally "
-"in this case."
+#, priority:100
+msgid "it has to start with \"refs/\"; <dst> is used as the destination literally in this case."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:83 en/git-send-pack.txt:142
-msgid ""
-"<src> == <dst> and the ref that matched the <src> must not exist in the set "
-"of remote refs; the ref matched <src> locally is used as the name of the "
-"destination."
+#, priority:100
+msgid "<src> == <dst> and the ref that matched the <src> must not exist in the set of remote refs; the ref matched <src> locally is used as the name of the destination."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:89 en/git-send-pack.txt:148
-msgid ""
-"Without `--force`, the <src> ref is stored at the remote only if <dst> does "
-"not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This "
-"check, known as \"fast-forward check\", is performed in order to avoid "
-"accidentally overwriting the remote ref and lose other peoples' commits from "
-"there."
+#, priority:100
+msgid "Without `--force`, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This check, known as \"fast-forward check\", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples' commits from there."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:91 en/git-send-pack.txt:150
+#, priority:100
msgid "With `--force`, the fast-forward check is disabled for all refs."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:94 en/git-send-pack.txt:153
-msgid ""
-"Optionally, a <ref> parameter can be prefixed with a plus '+' sign to "
-"disable the fast-forward check only on that ref."
+#, priority:100
+msgid "Optionally, a <ref> parameter can be prefixed with a plus '+' sign to disable the fast-forward check only on that ref."
msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-imap-send(1)"
msgstr "git-imap-send(1)"
#. type: Plain text
#: en/git-imap-send.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
msgstr "Enviar una colecci처n de parches de stdin a una carpeta IMAP"
#. type: Plain text
#: en/git-imap-send.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:23
-msgid ""
-"This command uploads a mailbox generated with 'git format-patch' into an "
-"IMAP drafts folder. This allows patches to be sent as other email is when "
-"using mail clients that cannot read mailbox files directly. The command also "
-"works with any general mailbox in which emails have the fields \"From\", "
-"\"Date\", and \"Subject\" in that order."
+#, priority:100
+msgid "This command uploads a mailbox generated with 'git format-patch' into an IMAP drafts folder. This allows patches to be sent as other email is when using mail clients that cannot read mailbox files directly. The command also works with any general mailbox in which emails have the fields \"From\", \"Date\", and \"Subject\" in that order."
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:25
+#, priority:100
msgid "Typical usage is something like:"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:27
+#, priority:100
msgid "git format-patch --signoff --stdout --attach origin | git imap-send"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:39
-#, fuzzy
+#, fuzzy, priority:100
msgid "Be quiet."
msgstr "ser silencioso"
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--curl"
msgstr "--curl"
#. type: Plain text
#: en/git-imap-send.txt:44
-msgid ""
-"Use libcurl to communicate with the IMAP server, unless tunneling into it. "
-"Ignored if Git was built without the USE_CURL_FOR_IMAP_SEND option set."
+#, priority:100
+msgid "Use libcurl to communicate with the IMAP server, unless tunneling into it. Ignored if Git was built without the USE_CURL_FOR_IMAP_SEND option set."
msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-curl"
msgstr "--no-curl"
#. type: Plain text
#: en/git-imap-send.txt:49
-msgid ""
-"Talk to the IMAP server using git's own IMAP routines instead of using "
-"libcurl. Ignored if Git was built with the NO_OPENSSL option set."
+#, priority:100
+msgid "Talk to the IMAP server using git's own IMAP routines instead of using libcurl. Ignored if Git was built with the NO_OPENSSL option set."
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:56
-msgid ""
-"To use the tool, imap.folder and either imap.tunnel or imap.host must be set "
-"to appropriate values."
+#, priority:100
+msgid "To use the tool, imap.folder and either imap.tunnel or imap.host must be set to appropriate values."
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:66
+#, priority:100
msgid "Using tunnel mode:"
msgstr ""
#. type: delimited block .
#: en/git-imap-send.txt:71
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[imap]\n"
" folder = \"INBOX.Drafts\"\n"
-" tunnel = \"ssh -q -C user@example.com /usr/bin/imapd ./Maildir 2> "
-"/dev/null\"\n"
+" tunnel = \"ssh -q -C user@example.com /usr/bin/imapd ./Maildir 2> /dev/null\"\n"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:74
+#, priority:100
msgid "Using direct mode:"
msgstr ""
#. type: delimited block .
#: en/git-imap-send.txt:81
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[imap]\n"
" folder = \"INBOX.Drafts\"\n"
@@ -33465,12 +28550,13 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:84
+#, priority:100
msgid "Using direct mode with SSL:"
msgstr ""
#. type: delimited block .
#: en/git-imap-send.txt:93
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[imap]\n"
" folder = \"INBOX.Drafts\"\n"
@@ -33483,14 +28569,13 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:100
-msgid ""
-"To submit patches using GMail's IMAP interface, first, edit your "
-"~/.gitconfig to specify your account settings:"
+#, priority:100
+msgid "To submit patches using GMail's IMAP interface, first, edit your ~/.gitconfig to specify your account settings:"
msgstr ""
#. type: delimited block -
#: en/git-imap-send.txt:108
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[imap]\n"
"\tfolder = \"[Gmail]/Drafts\"\n"
@@ -33502,79 +28587,70 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:112
-msgid ""
-"You might need to instead use: folder = \"[Google Mail]/Drafts\" if you get "
-"an error that the \"Folder doesn't exist\"."
+#, priority:100
+msgid "You might need to instead use: folder = \"[Google Mail]/Drafts\" if you get an error that the \"Folder doesn't exist\"."
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:114
+#, priority:100
msgid "Once the commits are ready to be sent, run the following command:"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:116
-#, no-wrap
-msgid ""
-" $ git format-patch --cover-letter -M --stdout origin/master | git "
-"imap-send\n"
+#, no-wrap, priority:100
+msgid " $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:120
-msgid ""
-"Just make sure to disable line wrapping in the email client (GMail's web "
-"interface will wrap lines no matter what, so you need to use a real IMAP "
-"client)."
+#, priority:100
+msgid "Just make sure to disable line wrapping in the email client (GMail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
msgstr ""
#. type: Title -
#: en/git-imap-send.txt:122
-#, no-wrap
+#, no-wrap, priority:100
msgid "CAUTION"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:129
-msgid ""
-"It is still your responsibility to make sure that the email message sent by "
-"your email program meets the standards of your project. Many projects do "
-"not like patches to be attached. Some mail agents will transform patches "
-"(e.g. wrap lines, send them as format=flowed) in ways that make them fail. "
-"You will get angry flames ridiculing you if you don't check this."
+#, priority:100
+msgid "It is still your responsibility to make sure that the email message sent by your email program meets the standards of your project. Many projects do not like patches to be attached. Some mail agents will transform patches (e.g. wrap lines, send them as format=flowed) in ways that make them fail. You will get angry flames ridiculing you if you don't check this."
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:133
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Thunderbird in particular is known to be problematic. Thunderbird\n"
"users may wish to visit this web page for more information:\n"
-" "
-"http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email\n"
+" http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email\n"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:137
+#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-send-email[1], mbox(5)"
msgstr ""
#. type: Title =
#: en/git-index-pack.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-index-pack(1)"
msgstr "git-index-pack(1)"
#. type: Plain text
#: en/git-index-pack.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-index-pack - Build pack index file for an existing packed archive"
msgstr "Constuye un archivo de 챠ndice para un archivo empaquetado existente"
#. type: Plain text
#: en/git-index-pack.txt:15
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git index-pack' [-v] [-o <index-file>] <pack-file>\n"
"'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n"
@@ -33583,211 +28659,181 @@ msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:23
-msgid ""
-"Reads a packed archive (.pack) from the specified file, and builds a pack "
-"index file (.idx) for it. The packed archive together with the pack index "
-"can then be placed in the objects/pack/ directory of a Git repository."
+#, priority:100
+msgid "Reads a packed archive (.pack) from the specified file, and builds a pack index file (.idx) for it. The packed archive together with the pack index can then be placed in the objects/pack/ directory of a Git repository."
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:29
+#, priority:100
msgid "Be verbose about what is going on, including progress status."
msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:30
-#, no-wrap
+#, no-wrap, priority:100
msgid "-o <index-file>"
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:37
-msgid ""
-"Write the generated pack index into the specified file. Without this option "
-"the name of pack index file is constructed from the name of packed archive "
-"file by replacing .pack with .idx (and the program fails if the name of "
-"packed archive does not end with .pack)."
+#, priority:100
+msgid "Write the generated pack index into the specified file. Without this option the name of pack index file is constructed from the name of packed archive file by replacing .pack with .idx (and the program fails if the name of packed archive does not end with .pack)."
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:47
-msgid ""
-"When this flag is provided, the pack is read from stdin instead and a copy "
-"is then written to <pack-file>. If <pack-file> is not specified, the pack is "
-"written to objects/pack/ directory of the current Git repository with a "
-"default name determined from the pack content. If <pack-file> is not "
-"specified consider using --keep to prevent a race condition between this "
-"process and 'git repack'."
+#, priority:100
+msgid "When this flag is provided, the pack is read from stdin instead and a copy is then written to <pack-file>. If <pack-file> is not specified, the pack is written to objects/pack/ directory of the current Git repository with a default name determined from the pack content. If <pack-file> is not specified consider using --keep to prevent a race condition between this process and 'git repack'."
msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--fix-thin"
msgstr "--fix-thin"
#. type: Plain text
#: en/git-index-pack.txt:53
-msgid ""
-"Fix a \"thin\" pack produced by `git pack-objects --thin` (see "
-"linkgit:git-pack-objects[1] for details) by adding the excluded objects the "
-"deltified objects are based on to the pack. This option only makes sense in "
-"conjunction with --stdin."
+#, priority:100
+msgid "Fix a \"thin\" pack produced by `git pack-objects --thin` (see linkgit:git-pack-objects[1] for details) by adding the excluded objects the deltified objects are based on to the pack. This option only makes sense in conjunction with --stdin."
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:61
-msgid ""
-"Before moving the index into its final destination create an empty .keep "
-"file for the associated pack file. This option is usually necessary with "
-"--stdin to prevent a simultaneous 'git repack' process from deleting the "
-"newly constructed pack and index before refs can be updated to use objects "
-"contained in the pack."
+#, priority:100
+msgid "Before moving the index into its final destination create an empty .keep file for the associated pack file. This option is usually necessary with --stdin to prevent a simultaneous 'git repack' process from deleting the newly constructed pack and index before refs can be updated to use objects contained in the pack."
msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:62
-#, no-wrap
+#, no-wrap, priority:100
msgid "--keep=<msg>"
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:68
-msgid ""
-"Like --keep create a .keep file before moving the index into its final "
-"destination, but rather than creating an empty file place '<msg>' followed "
-"by an LF into the .keep file. The '<msg>' message can later be searched for "
-"within all .keep files to locate any which have outlived their usefulness."
+#, priority:100
+msgid "Like --keep create a .keep file before moving the index into its final destination, but rather than creating an empty file place '<msg>' followed by an LF into the .keep file. The '<msg>' message can later be searched for within all .keep files to locate any which have outlived their usefulness."
msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:69 en/git-pack-objects.txt:249
-#, no-wrap
+#, no-wrap, priority:100
msgid "--index-version=<version>[,<offset>]"
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:73 en/git-pack-objects.txt:253
-msgid ""
-"This is intended to be used by the test suite only. It allows to force the "
-"version for the generated pack index, and to force 64-bit index entries on "
-"objects located above the given offset."
+#, priority:100
+msgid "This is intended to be used by the test suite only. It allows to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset."
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:76
+#, priority:100
msgid "Die, if the pack contains broken objects or links."
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:79
+#, priority:100
msgid "Die if the pack contains broken links. For internal use only."
msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:80
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--fsck-objects"
msgstr "--fsck-objects"
#. type: Plain text
#: en/git-index-pack.txt:82
+#, priority:100
msgid "Die if the pack contains broken objects. For internal use only."
msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:83 en/git-pack-objects.txt:239 en/git-repack.txt:102
-#, no-wrap
+#, no-wrap, priority:100
msgid "--threads=<n>"
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:92
-msgid ""
-"Specifies the number of threads to spawn when resolving deltas. This "
-"requires that index-pack be compiled with pthreads otherwise this option is "
-"ignored with a warning. This is meant to reduce packing time on "
-"multiprocessor machines. The required amount of memory for the delta search "
-"window is however multiplied by the number of threads. Specifying 0 will "
-"cause Git to auto-detect the number of CPU's and use maximum 3 threads."
+#, priority:100
+msgid "Specifies the number of threads to spawn when resolving deltas. This requires that index-pack be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and use maximum 3 threads."
msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:93 en/git-unpack-objects.txt:47
-#, no-wrap
+#, no-wrap, priority:100
msgid "--max-input-size=<size>"
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:95 en/git-unpack-objects.txt:49
+#, priority:100
msgid "Die, if the pack is larger than <size>."
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:103
-msgid ""
-"Once the index has been created, the list of object names is sorted and the "
-"SHA-1 hash of that list is printed to stdout. If --stdin was also used then "
-"this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file "
-"was successfully created. This is useful to remove a"
+#, priority:100
+msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
msgstr ""
#. type: Block title
#: en/git-index-pack.txt:103
-#, no-wrap
+#, no-wrap, priority:100
msgid "keep file used as a lock to prevent the race with 'git repack'"
msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:105
+#, priority:100
msgid "mentioned above."
msgstr ""
#. type: Title =
#: en/git-init-db.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
#. type: Plain text
#: en/git-init-db.txt:7
+#, priority:100
msgid "git-init-db - Creates an empty Git repository"
msgstr ""
#. type: Plain text
#: en/git-init-db.txt:13
-#, no-wrap
-msgid ""
-"'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] "
-"[--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
+#, no-wrap, priority:100
+msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
msgstr ""
#. type: Plain text
#: en/git-init-db.txt:20
-msgid ""
-"This is a synonym for linkgit:git-init[1]. Please refer to the "
-"documentation of that command."
+#, priority:100
+msgid "This is a synonym for linkgit:git-init[1]. Please refer to the documentation of that command."
msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:300
msgid "git-init(1)"
msgstr "git-init(1)"
#. type: Plain text
#: en/git-init.txt:7
-#, fuzzy
+#, fuzzy, priority:300
msgid "git-init - Create an empty Git repository or reinitialize an existing one"
msgstr "Crea un repositorio de Git vac챠o o reinicia el que ya existe"
#. type: Plain text
#: en/git-init.txt:15
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
"\t [--separate-git-dir <git dir>]\n"
@@ -33796,235 +28842,205 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:24
-msgid ""
-"This command creates an empty Git repository - basically a `.git` directory "
-"with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template "
-"files. An initial `HEAD` file that references the HEAD of the master branch "
-"is also created."
+#, priority:300
+msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created."
msgstr ""
#. type: Plain text
#: en/git-init.txt:27
-msgid ""
-"If the `$GIT_DIR` environment variable is set then it specifies a path to "
-"use instead of `./.git` for the base of the repository."
+#, priority:300
+msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
msgstr ""
#. type: Plain text
#: en/git-init.txt:32
-msgid ""
-"If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` "
-"environment variable then the sha1 directories are created underneath - "
-"otherwise the default `$GIT_DIR/objects` directory is used."
+#, priority:300
+msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Plain text
#: en/git-init.txt:37
-msgid ""
-"Running 'git init' in an existing repository is safe. It will not overwrite "
-"things that are already there. The primary reason for rerunning 'git init' "
-"is to pick up newly added templates (or to move the repository to another "
-"place if --separate-git-dir is given)."
+#, priority:300
+msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
msgstr ""
#. type: Plain text
#: en/git-init.txt:45
+#, priority:300
msgid "Only print error and warning messages; all other output will be suppressed."
msgstr ""
#. type: Plain text
#: en/git-init.txt:50
-msgid ""
-"Create a bare repository. If `GIT_DIR` environment is not set, it is set to "
-"the current working directory."
+#, priority:300
+msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
msgstr ""
#. type: Plain text
#: en/git-init.txt:55
-msgid ""
-"Specify the directory from which templates will be used. (See the "
-"\"TEMPLATE DIRECTORY\" section below.)"
+#, priority:300
+msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
msgstr ""
#. type: Plain text
#: en/git-init.txt:62
-msgid ""
-"Instead of initializing the repository as a directory to either `$GIT_DIR` "
-"or `./.git/`, create a text file there containing the path to the actual "
-"repository. This file acts as filesystem-agnostic Git symbolic link to the "
-"repository."
+#, priority:300
+msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository."
msgstr ""
#. type: Plain text
#: en/git-init.txt:64
-msgid ""
-"If this is reinitialization, the repository will be moved to the specified "
-"path."
+#, priority:300
+msgid "If this is reinitialization, the repository will be moved to the specified path."
msgstr ""
#. type: Labeled list
#: en/git-init.txt:65
-#, no-wrap
+#, no-wrap, priority:300
msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
msgstr ""
#. type: Plain text
#: en/git-init.txt:73
-msgid ""
-"Specify that the Git repository is to be shared amongst several users. This "
-"allows users belonging to the same group to push into that repository. When "
-"specified, the config variable \"core.sharedRepository\" is set so that "
-"files and directories under `$GIT_DIR` are created with the requested "
-"permissions. When not specified, Git will use permissions reported by "
-"umask(2)."
+#, priority:300
+msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)."
msgstr ""
#. type: Plain text
#: en/git-init.txt:76
-msgid ""
-"The option can have the following values, defaulting to 'group' if no value "
-"is given:"
+#, priority:300
+msgid "The option can have the following values, defaulting to 'group' if no value is given:"
msgstr ""
#. type: Labeled list
#: en/git-init.txt:78
-#, no-wrap
+#, no-wrap, priority:300
msgid "'umask' (or 'false')"
msgstr ""
#. type: Plain text
#: en/git-init.txt:82
-msgid ""
-"Use permissions reported by umask(2). The default, when `--shared` is not "
-"specified."
+#, priority:300
+msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
msgstr ""
#. type: Labeled list
#: en/git-init.txt:83
-#, no-wrap
+#, no-wrap, priority:300
msgid "'group' (or 'true')"
msgstr ""
#. type: Plain text
#: en/git-init.txt:91
-msgid ""
-"Make the repository group-writable, (and g+sx, since the git group may be "
-"not the primary group of all users). This is used to loosen the permissions "
-"of an otherwise safe umask(2) value. Note that the umask still applies to "
-"the other permission bits (e.g. if umask is '0022', using 'group' will not "
-"remove read privileges from other (non-group) users). See '0xxx' for how to "
-"exactly specify the repository permissions."
+#, priority:300
+msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
msgstr ""
#. type: Labeled list
#: en/git-init.txt:92
-#, no-wrap
+#, no-wrap, priority:300
msgid "'all' (or 'world' or 'everybody')"
msgstr ""
#. type: Plain text
#: en/git-init.txt:95
+#, priority:300
msgid "Same as 'group', but make the repository readable by all users."
msgstr ""
#. type: Labeled list
#: en/git-init.txt:96
-#, no-wrap
+#, no-wrap, priority:300
msgid "'0xxx'"
msgstr ""
#. type: Plain text
#: en/git-init.txt:103
-msgid ""
-"'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will "
-"override users' umask(2) value (and not only loosen permissions as 'group' "
-"and 'all' does). '0640' will create a repository which is group-readable, "
-"but not group-writable or accessible to others. '0660' will create a repo "
-"that is readable and writable to the current user and group, but "
-"inaccessible to others."
+#, priority:300
+msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
msgstr ""
#. type: Plain text
#: en/git-init.txt:108
-msgid ""
-"By default, the configuration flag `receive.denyNonFastForwards` is enabled "
-"in shared repositories, so that you cannot force a non fast-forwarding push "
-"into it."
+#, priority:300
+msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
msgstr ""
#. type: Plain text
#: en/git-init.txt:111
-msgid ""
-"If you provide a 'directory', the command is run inside it. If this "
-"directory does not exist, it will be created."
+#, priority:300
+msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
msgstr ""
#. type: Title -
#: en/git-init.txt:113
-#, no-wrap
+#, no-wrap, priority:300
msgid "TEMPLATE DIRECTORY"
msgstr ""
#. type: Plain text
#: en/git-init.txt:117
-msgid ""
-"Files and directories in the template directory whose name do not start with "
-"a dot will be copied to the `$GIT_DIR` after it is created."
+#, priority:300
+msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
msgstr ""
#. type: Plain text
#: en/git-init.txt:119
+#, priority:300
msgid "The template directory will be one of the following (in order):"
msgstr ""
#. type: Plain text
#: en/git-init.txt:121
+#, priority:300
msgid "the argument given with the `--template` option;"
msgstr ""
#. type: Plain text
#: en/git-init.txt:123
+#, priority:300
msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
msgstr ""
#. type: Plain text
#: en/git-init.txt:125
+#, priority:300
msgid "the `init.templateDir` configuration variable; or"
msgstr ""
#. type: Plain text
#: en/git-init.txt:127
+#, priority:300
msgid "the default template directory: `/usr/share/git-core/templates`."
msgstr ""
#. type: Plain text
#: en/git-init.txt:130
-msgid ""
-"The default template directory includes some directory structure, suggested "
-"\"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
+#, priority:300
+msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
msgstr ""
#. type: Plain text
#: en/git-init.txt:133
-msgid ""
-"The sample hooks are all disabled by default. To enable one of the sample "
-"hooks rename it by removing its `.sample` suffix."
+#, priority:300
+msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
msgstr ""
#. type: Plain text
#: en/git-init.txt:135
+#, priority:300
msgid "See linkgit:githooks[5] for more general info on hook execution."
msgstr ""
#. type: Labeled list
#: en/git-init.txt:139
-#, no-wrap
+#, no-wrap, priority:300
msgid "Start a new Git repository for an existing code base"
msgstr ""
#. type: delimited block -
#: en/git-init.txt:146
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"$ cd /path/to/my/codebase\n"
"$ git init <1>\n"
@@ -34034,35 +29050,37 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:149
+#, priority:300
msgid "Create a /path/to/my/codebase/.git directory."
msgstr ""
#. type: Plain text
#: en/git-init.txt:150
+#, priority:300
msgid "Add all existing files to the index."
msgstr ""
#. type: Plain text
#: en/git-init.txt:151
+#, priority:300
msgid "Record the pristine state as the first commit in the history."
msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-instaweb(1)"
msgstr "git-instaweb(1)"
#. type: Plain text
#: en/git-instaweb.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-instaweb - Instantly browse your working repository in gitweb"
msgstr "Buscar instant찼neamente tu repositorio de trabajo en gitweb"
#. type: Plain text
#: en/git-instaweb.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git instaweb' [--local] [--httpd=<httpd>] [--port=<port>]\n"
" [--browser=<browser>]\n"
@@ -34071,143 +29089,127 @@ msgstr ""
#. type: Plain text
#: en/git-instaweb.txt:19
-msgid ""
-"A simple script to set up `gitweb` and a web server for browsing the local "
-"repository."
+#, priority:100
+msgid "A simple script to set up `gitweb` and a web server for browsing the local repository."
msgstr ""
#. type: Plain text
#: en/git-instaweb.txt:26
+#, priority:100
msgid "Only bind the web server to the local IP (127.0.0.1)."
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--httpd"
msgstr "--httpd"
#. type: Plain text
#: en/git-instaweb.txt:35
-msgid ""
-"The HTTP daemon command-line that will be executed. Command-line options "
-"may be specified here, and the configuration file will be added at the end "
-"of the command-line. Currently apache2, lighttpd, mongoose, plackup, python "
-"and webrick are supported. (Default: lighttpd)"
+#, priority:100
+msgid "The HTTP daemon command-line that will be executed. Command-line options may be specified here, and the configuration file will be added at the end of the command-line. Currently apache2, lighttpd, mongoose, plackup, python and webrick are supported. (Default: lighttpd)"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:37
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--module-path"
msgstr "--module-path"
#. type: Plain text
#: en/git-instaweb.txt:40
-msgid ""
-"The module path (only needed if httpd is Apache). (Default: "
-"/usr/lib/apache2/modules)"
+#, priority:100
+msgid "The module path (only needed if httpd is Apache). (Default: /usr/lib/apache2/modules)"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:42
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--port"
msgstr "--port"
#. type: Plain text
#: en/git-instaweb.txt:44
+#, priority:100
msgid "The port number to bind the httpd to. (Default: 1234)"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:46
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--browser"
msgstr "--browser"
#. type: Plain text
#: en/git-instaweb.txt:52
-msgid ""
-"The web browser that should be used to view the gitweb page. This will be "
-"passed to the 'git web{litdd}browse' helper script along with the URL of the "
-"gitweb instance. See linkgit:git-web{litdd}browse[1] for more information "
-"about this. If the script fails, the URL will be printed to stdout."
+#, priority:100
+msgid "The web browser that should be used to view the gitweb page. This will be passed to the 'git web{litdd}browse' helper script along with the URL of the gitweb instance. See linkgit:git-web{litdd}browse[1] for more information about this. If the script fails, the URL will be printed to stdout."
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:53
-#, no-wrap
+#, no-wrap, priority:100
msgid "start"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:54
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--start"
msgstr "--start"
#. type: Plain text
#: en/git-instaweb.txt:57
-msgid ""
-"Start the httpd instance and exit. Regenerate configuration files as "
-"necessary for spawning a new instance."
+#, priority:100
+msgid "Start the httpd instance and exit. Regenerate configuration files as necessary for spawning a new instance."
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:58
-#, no-wrap
+#, no-wrap, priority:100
msgid "stop"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:59
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stop"
msgstr "--stop"
#. type: Plain text
#: en/git-instaweb.txt:63
-msgid ""
-"Stop the httpd instance and exit. This does not generate any of the "
-"configuration files for spawning a new instance, nor does it close the "
-"browser."
+#, priority:100
+msgid "Stop the httpd instance and exit. This does not generate any of the configuration files for spawning a new instance, nor does it close the browser."
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:64
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "restart"
msgstr "--restart"
#. type: Labeled list
#: en/git-instaweb.txt:65
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--restart"
msgstr "--restart"
#. type: Plain text
#: en/git-instaweb.txt:68
-msgid ""
-"Restart the httpd instance and exit. Regenerate configuration files as "
-"necessary for spawning a new instance."
+#, priority:100
+msgid "Restart the httpd instance and exit. Regenerate configuration files as necessary for spawning a new instance."
msgstr ""
#. type: Plain text
#: en/git-instaweb.txt:73
+#, priority:100
msgid "You may specify configuration in your .git/config"
msgstr ""
#. type: delimited block -
#: en/git-instaweb.txt:81
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[instaweb]\n"
"\tlocal = true\n"
@@ -34219,585 +29221,483 @@ msgstr ""
#. type: Plain text
#: en/git-instaweb.txt:87
-msgid ""
-"If the configuration variable `instaweb.browser` is not set, `web.browser` "
-"will be used instead if it is defined. See linkgit:git-web{litdd}browse[1] "
-"for more information about this."
+#, priority:100
+msgid "If the configuration variable `instaweb.browser` is not set, `web.browser` will be used instead if it is defined. See linkgit:git-web{litdd}browse[1] for more information about this."
msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-interpret-trailers(1)"
msgstr "git-interpret-trailers(1)"
#. type: Plain text
#: en/git-interpret-trailers.txt:7
-msgid ""
-"git-interpret-trailers - Add or parse structured information in commit "
-"messages"
+#, priority:100
+msgid "git-interpret-trailers - Add or parse structured information in commit messages"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git interpret-trailers' [<options>] [(--trailer <token>[(=|:)<value>])...] "
-"[<file>...]\n"
+"'git interpret-trailers' [<options>] [(--trailer <token>[(=|:)<value>])...] [<file>...]\n"
"'git interpret-trailers' [<options>] [--parse] [<file>...]\n"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:19
-msgid ""
-"Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail "
-"headers, at the end of the otherwise free-form part of a commit message."
+#, priority:100
+msgid "Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:23
-msgid ""
-"This command reads some patches or commit messages from either the <file> "
-"arguments or the standard input if no <file> is specified. If `--parse` is "
-"specified, the output consists of the parsed trailers."
+#, priority:100
+msgid "This command reads some patches or commit messages from either the <file> arguments or the standard input if no <file> is specified. If `--parse` is specified, the output consists of the parsed trailers."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:27
-msgid ""
-"Otherwise, this command applies the arguments passed using the `--trailer` "
-"option, if any, to the commit message part of each input file. The result is "
-"emitted on the standard output."
+#, priority:100
+msgid "Otherwise, this command applies the arguments passed using the `--trailer` option, if any, to the commit message part of each input file. The result is emitted on the standard output."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:32
-msgid ""
-"Some configuration variables control the way the `--trailer` arguments are "
-"applied to each commit message and the way any existing trailer in the "
-"commit message is changed. They also make it possible to automatically add "
-"some trailers."
+#, priority:100
+msgid "Some configuration variables control the way the `--trailer` arguments are applied to each commit message and the way any existing trailer in the commit message is changed. They also make it possible to automatically add some trailers."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:39
-msgid ""
-"By default, a '<token>=<value>' or '<token>:<value>' argument given using "
-"`--trailer` will be appended after the existing trailers only if the last "
-"trailer has a different (<token>, <value>) pair (or if there is no existing "
-"trailer). The <token> and <value> parts will be trimmed to remove starting "
-"and trailing whitespace, and the resulting trimmed <token> and <value> will "
-"appear in the message like this:"
+#, priority:100
+msgid "By default, a '<token>=<value>' or '<token>:<value>' argument given using `--trailer` will be appended after the existing trailers only if the last trailer has a different (<token>, <value>) pair (or if there is no existing trailer). The <token> and <value> parts will be trimmed to remove starting and trailing whitespace, and the resulting trimmed <token> and <value> will appear in the message like this:"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:42
-#, no-wrap
+#, no-wrap, priority:100
msgid "token: value\n"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:46
-msgid ""
-"This means that the trimmed <token> and <value> will be separated by `': '` "
-"(one colon followed by one space)."
+#, priority:100
+msgid "This means that the trimmed <token> and <value> will be separated by `': '` (one colon followed by one space)."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:52
-msgid ""
-"By default the new trailer will appear at the end of all the existing "
-"trailers. If there is no existing trailer, the new trailer will appear after "
-"the commit message part of the output, and, if there is no line with only "
-"spaces at the end of the commit message part, one blank line will be added "
-"before the new trailer."
+#, priority:100
+msgid "By default the new trailer will appear at the end of all the existing trailers. If there is no existing trailer, the new trailer will appear after the commit message part of the output, and, if there is no line with only spaces at the end of the commit message part, one blank line will be added before the new trailer."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:62
-msgid ""
-"Existing trailers are extracted from the input message by looking for a "
-"group of one or more lines that (i) is all trailers, or (ii) contains at "
-"least one Git-generated or user-configured trailer and consists of at least "
-"25% trailers. The group must be preceded by one or more empty (or "
-"whitespace-only) lines. The group must either be at the end of the message "
-"or be the last non-whitespace lines before a line that starts with '---' "
-"(followed by a space or the end of the line). Such three minus signs start "
-"the patch part of the message. See also `--no-divider` below."
+#, priority:100
+msgid "Existing trailers are extracted from the input message by looking for a group of one or more lines that (i) is all trailers, or (ii) contains at least one Git-generated or user-configured trailer and consists of at least 25% trailers. The group must be preceded by one or more empty (or whitespace-only) lines. The group must either be at the end of the message or be the last non-whitespace lines before a line that starts with '---' (followed by a space or the end of the line). Such three minus signs start the patch part of the message. See also `--no-divider` below."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:67
-msgid ""
-"When reading trailers, there can be whitespaces after the token, the "
-"separator and the value. There can also be whitespaces inside the token and "
-"the value. The value may be split over multiple lines with each subsequent "
-"line starting with whitespace, like the \"folding\" in RFC 822."
+#, priority:100
+msgid "When reading trailers, there can be whitespaces after the token, the separator and the value. There can also be whitespaces inside the token and the value. The value may be split over multiple lines with each subsequent line starting with whitespace, like the \"folding\" in RFC 822."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:71
-msgid ""
-"Note that 'trailers' do not follow and are not intended to follow many rules "
-"for RFC 822 headers. For example they do not follow the encoding rules and "
-"probably many other rules."
+#, priority:100
+msgid "Note that 'trailers' do not follow and are not intended to follow many rules for RFC 822 headers. For example they do not follow the encoding rules and probably many other rules."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:74
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--in-place"
msgstr "--in-place"
#. type: Plain text
#: en/git-interpret-trailers.txt:76
-#, fuzzy
+#, fuzzy, priority:100
msgid "Edit the files in place."
msgstr "editar archivos en el lugar"
#. type: Labeled list
#: en/git-interpret-trailers.txt:77
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--trim-empty"
msgstr "--trim-empty"
#. type: Plain text
#: en/git-interpret-trailers.txt:81
-msgid ""
-"If the <value> part of any trailer contains only whitespace, the whole "
-"trailer will be removed from the resulting message. This applies to "
-"existing trailers as well as new trailers."
+#, priority:100
+msgid "If the <value> part of any trailer contains only whitespace, the whole trailer will be removed from the resulting message. This applies to existing trailers as well as new trailers."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:82
-#, no-wrap
+#, no-wrap, priority:100
msgid "--trailer <token>[(=|:)<value>]"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:86
-msgid ""
-"Specify a (<token>, <value>) pair that should be applied as a trailer to the "
-"input messages. See the description of this command."
+#, priority:100
+msgid "Specify a (<token>, <value>) pair that should be applied as a trailer to the input messages. See the description of this command."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:87
-#, no-wrap
+#, no-wrap, priority:100
msgid "--where <placement>"
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:88
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-where"
msgstr "--no-where"
#. type: Plain text
#: en/git-interpret-trailers.txt:94
-msgid ""
-"Specify where all new trailers will be added. A setting provided with "
-"'--where' overrides all configuration variables and applies to all "
-"'--trailer' options until the next occurrence of '--where' or "
-"'--no-where'. Possible values are `after`, `before`, `end` or `start`."
+#, priority:100
+msgid "Specify where all new trailers will be added. A setting provided with '--where' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--where' or '--no-where'. Possible values are `after`, `before`, `end` or `start`."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:95
-#, no-wrap
+#, no-wrap, priority:100
msgid "--if-exists <action>"
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:96
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-if-exists"
msgstr "--no-if-exists"
#. type: Plain text
#: en/git-interpret-trailers.txt:103
-msgid ""
-"Specify what action will be performed when there is already at least one "
-"trailer with the same <token> in the message. A setting provided with "
-"'--if-exists' overrides all configuration variables and applies to all "
-"'--trailer' options until the next occurrence of '--if-exists' or "
-"'--no-if-exists'. Possible actions are `addIfDifferent`, "
-"`addIfDifferentNeighbor`, `add`, `replace` and `doNothing`."
+#, priority:100
+msgid "Specify what action will be performed when there is already at least one trailer with the same <token> in the message. A setting provided with '--if-exists' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`, `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:104
-#, no-wrap
+#, no-wrap, priority:100
msgid "--if-missing <action>"
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:105
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-if-missing"
msgstr "--no-if-missing"
#. type: Plain text
#: en/git-interpret-trailers.txt:112
-msgid ""
-"Specify what action will be performed when there is no other trailer with "
-"the same <token> in the message. A setting provided with '--if-missing' "
-"overrides all configuration variables and applies to all '--trailer' options "
-"until the next occurrence of '--if-missing' or '--no-if-missing'. Possible "
-"actions are `doNothing` or `add`."
+#, priority:100
+msgid "Specify what action will be performed when there is no other trailer with the same <token> in the message. A setting provided with '--if-missing' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--if-missing' or '--no-if-missing'. Possible actions are `doNothing` or `add`."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:113
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--only-trailers"
msgstr "--only-trailers"
#. type: Plain text
#: en/git-interpret-trailers.txt:115
+#, priority:100
msgid "Output only the trailers, not any other parts of the input."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:116
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--only-input"
msgstr "--only-input"
#. type: Plain text
#: en/git-interpret-trailers.txt:120
-msgid ""
-"Output only trailers that exist in the input; do not add any from the "
-"command-line or by following configured `trailer.*` rules."
+#, priority:100
+msgid "Output only trailers that exist in the input; do not add any from the command-line or by following configured `trailer.*` rules."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:121
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unfold"
msgstr "--unfold"
#. type: Plain text
#: en/git-interpret-trailers.txt:124
-msgid ""
-"Remove any whitespace-continuation in trailers, so that each trailer appears "
-"on a line by itself with its full content."
+#, priority:100
+msgid "Remove any whitespace-continuation in trailers, so that each trailer appears on a line by itself with its full content."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:125
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--parse"
msgstr "--parse"
#. type: Plain text
#: en/git-interpret-trailers.txt:128
+#, priority:100
msgid "A convenience alias for `--only-trailers --only-input --unfold`."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:129
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-divider"
msgstr "--no-divider"
#. type: Plain text
#: en/git-interpret-trailers.txt:133
-msgid ""
-"Do not treat `---` as the end of the commit message. Use this when you know "
-"your input contains just the commit message itself (and not an email or the "
-"output of `git format-patch`)."
+#, priority:100
+msgid "Do not treat `---` as the end of the commit message. Use this when you know your input contains just the commit message itself (and not an email or the output of `git format-patch`)."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:137
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.separators"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:142
-msgid ""
-"This option tells which characters are recognized as trailer separators. By "
-"default only ':' is recognized as a trailer separator, except that '=' is "
-"always accepted on the command line for compatibility with other git "
-"commands."
+#, priority:100
+msgid "This option tells which characters are recognized as trailer separators. By default only ':' is recognized as a trailer separator, except that '=' is always accepted on the command line for compatibility with other git commands."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:146
-msgid ""
-"The first character given by this option will be the default character used "
-"when another separator is not specified in the config for this trailer."
+#, priority:100
+msgid "The first character given by this option will be the default character used when another separator is not specified in the config for this trailer."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:153
-msgid ""
-"For example, if the value for this option is \"%=$\", then only lines using "
-"the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and "
-"then spaces will be considered trailers. And '%' will be the default "
-"separator used, so by default trailers will appear like: '<token>% <value>' "
-"(one percent sign and one space will appear between the token and the "
-"value)."
+#, priority:100
+msgid "For example, if the value for this option is \"%=$\", then only lines using the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and then spaces will be considered trailers. And '%' will be the default separator used, so by default trailers will appear like: '<token>% <value>' (one percent sign and one space will appear between the token and the value)."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:154
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.where"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:156
+#, priority:100
msgid "This option tells where a new trailer will be added."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:158
+#, priority:100
msgid "This can be `end`, which is the default, `start`, `after` or `before`."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:161
-msgid ""
-"If it is `end`, then each new trailer will appear at the end of the existing "
-"trailers."
+#, priority:100
+msgid "If it is `end`, then each new trailer will appear at the end of the existing trailers."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:164
-msgid ""
-"If it is `start`, then each new trailer will appear at the start, instead of "
-"the end, of the existing trailers."
+#, priority:100
+msgid "If it is `start`, then each new trailer will appear at the start, instead of the end, of the existing trailers."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:167
-msgid ""
-"If it is `after`, then each new trailer will appear just after the last "
-"trailer with the same <token>."
+#, priority:100
+msgid "If it is `after`, then each new trailer will appear just after the last trailer with the same <token>."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:170
-msgid ""
-"If it is `before`, then each new trailer will appear just before the first "
-"trailer with the same <token>."
+#, priority:100
+msgid "If it is `before`, then each new trailer will appear just before the first trailer with the same <token>."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:171
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.ifexists"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:175
-msgid ""
-"This option makes it possible to choose what action will be performed when "
-"there is already at least one trailer with the same <token> in the message."
+#, priority:100
+msgid "This option makes it possible to choose what action will be performed when there is already at least one trailer with the same <token> in the message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:178
-msgid ""
-"The valid values for this option are: `addIfDifferentNeighbor` (this is the "
-"default), `addIfDifferent`, `add`, `replace` or `doNothing`."
+#, priority:100
+msgid "The valid values for this option are: `addIfDifferentNeighbor` (this is the default), `addIfDifferent`, `add`, `replace` or `doNothing`."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:182
-msgid ""
-"With `addIfDifferentNeighbor`, a new trailer will be added only if no "
-"trailer with the same (<token>, <value>) pair is above or below the line "
-"where the new trailer will be added."
+#, priority:100
+msgid "With `addIfDifferentNeighbor`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is above or below the line where the new trailer will be added."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:185
-msgid ""
-"With `addIfDifferent`, a new trailer will be added only if no trailer with "
-"the same (<token>, <value>) pair is already in the message."
+#, priority:100
+msgid "With `addIfDifferent`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is already in the message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:188
-msgid ""
-"With `add`, a new trailer will be added, even if some trailers with the same "
-"(<token>, <value>) pair are already in the message."
+#, priority:100
+msgid "With `add`, a new trailer will be added, even if some trailers with the same (<token>, <value>) pair are already in the message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:193
-msgid ""
-"With `replace`, an existing trailer with the same <token> will be deleted "
-"and the new trailer will be added. The deleted trailer will be the closest "
-"one (with the same <token>) to the place where the new one will be added."
+#, priority:100
+msgid "With `replace`, an existing trailer with the same <token> will be deleted and the new trailer will be added. The deleted trailer will be the closest one (with the same <token>) to the place where the new one will be added."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:196
-msgid ""
-"With `doNothing`, nothing will be done; that is no new trailer will be added "
-"if there is already one with the same <token> in the message."
+#, priority:100
+msgid "With `doNothing`, nothing will be done; that is no new trailer will be added if there is already one with the same <token> in the message."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:197
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.ifmissing"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:201
-msgid ""
-"This option makes it possible to choose what action will be performed when "
-"there is not yet any trailer with the same <token> in the message."
+#, priority:100
+msgid "This option makes it possible to choose what action will be performed when there is not yet any trailer with the same <token> in the message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:204
-msgid ""
-"The valid values for this option are: `add` (this is the default) and "
-"`doNothing`."
+#, priority:100
+msgid "The valid values for this option are: `add` (this is the default) and `doNothing`."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:206
+#, priority:100
msgid "With `add`, a new trailer will be added."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:208
+#, priority:100
msgid "With `doNothing`, nothing will be done."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:209
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.<token>.key"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:215
-msgid ""
-"This `key` will be used instead of <token> in the trailer. At the end of "
-"this key, a separator can appear and then some space characters. By default "
-"the only valid separator is ':', but this can be changed using the "
-"`trailer.separators` config variable."
+#, priority:100
+msgid "This `key` will be used instead of <token> in the trailer. At the end of this key, a separator can appear and then some space characters. By default the only valid separator is ':', but this can be changed using the `trailer.separators` config variable."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:218
-msgid ""
-"If there is a separator, then the key will be used instead of both the "
-"<token> and the default separator when adding the trailer."
+#, priority:100
+msgid "If there is a separator, then the key will be used instead of both the <token> and the default separator when adding the trailer."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:219
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.<token>.where"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:223
-msgid ""
-"This option takes the same values as the 'trailer.where' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+#, priority:100
+msgid "This option takes the same values as the 'trailer.where' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:224
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.<token>.ifexists"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:228
-msgid ""
-"This option takes the same values as the 'trailer.ifexists' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+#, priority:100
+msgid "This option takes the same values as the 'trailer.ifexists' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:229
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.<token>.ifmissing"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:233
-msgid ""
-"This option takes the same values as the 'trailer.ifmissing' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+#, priority:100
+msgid "This option takes the same values as the 'trailer.ifmissing' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:234
-#, no-wrap
+#, no-wrap, priority:100
msgid "trailer.<token>.command"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:238
-msgid ""
-"This option can be used to specify a shell command that will be called to "
-"automatically add or modify a trailer with the specified <token>."
+#, priority:100
+msgid "This option can be used to specify a shell command that will be called to automatically add or modify a trailer with the specified <token>."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:244
-msgid ""
-"When this option is specified, the behavior is as if a special "
-"'<token>=<value>' argument were added at the beginning of the command line, "
-"where <value> is taken to be the standard output of the specified command "
-"with any leading and trailing whitespace trimmed off."
+#, priority:100
+msgid "When this option is specified, the behavior is as if a special '<token>=<value>' argument were added at the beginning of the command line, where <value> is taken to be the standard output of the specified command with any leading and trailing whitespace trimmed off."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:248
-msgid ""
-"If the command contains the `$ARG` string, this string will be replaced with "
-"the <value> part of an existing trailer with the same <token>, if any, "
-"before the command is launched."
+#, priority:100
+msgid "If the command contains the `$ARG` string, this string will be replaced with the <value> part of an existing trailer with the same <token>, if any, before the command is launched."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:254
-msgid ""
-"If some '<token>=<value>' arguments are also passed on the command line, "
-"when a 'trailer.<token>.command' is configured, the command will also be "
-"executed for each of these arguments. And the <value> part of these "
-"arguments, if any, will be used to replace the `$ARG` string in the command."
+#, priority:100
+msgid "If some '<token>=<value>' arguments are also passed on the command line, when a 'trailer.<token>.command' is configured, the command will also be executed for each of these arguments. And the <value> part of these arguments, if any, will be used to replace the `$ARG` string in the command."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:260
-msgid ""
-"Configure a 'sign' trailer with a 'Signed-off-by' key, and then add two of "
-"these trailers to a message:"
+#, priority:100
+msgid "Configure a 'sign' trailer with a 'Signed-off-by' key, and then add two of these trailers to a message:"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:265
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git config trailer.sign.key \"Signed-off-by\"\n"
"$ cat msg.txt\n"
@@ -34806,23 +29706,22 @@ msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:269
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"message\n"
-"$ cat msg.txt | git interpret-trailers --trailer 'sign: Alice "
-"<alice@example.com>' --trailer 'sign: Bob <bob@example.com>'\n"
+"$ cat msg.txt | git interpret-trailers --trailer 'sign: Alice <alice@example.com>' --trailer 'sign: Bob <bob@example.com>'\n"
"subject\n"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:271 en/git-interpret-trailers.txt:283 en/git-interpret-trailers.txt:290 en/git-interpret-trailers.txt:354
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "message\n"
msgstr "mensaje"
#. type: delimited block -
#: en/git-interpret-trailers.txt:274
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Signed-off-by: Alice <alice@example.com>\n"
"Signed-off-by: Bob <bob@example.com>\n"
@@ -34830,12 +29729,13 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:277
+#, priority:100
msgid "Use the `--in-place` option to edit a message file in place:"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:281
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ cat msg.txt\n"
"subject\n"
@@ -34843,18 +29743,17 @@ msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:288
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Signed-off-by: Bob <bob@example.com>\n"
-"$ git interpret-trailers --trailer 'Acked-by: Alice <alice@example.com>' "
-"--in-place msg.txt\n"
+"$ git interpret-trailers --trailer 'Acked-by: Alice <alice@example.com>' --in-place msg.txt\n"
"$ cat msg.txt\n"
"subject\n"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:293
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Signed-off-by: Bob <bob@example.com>\n"
"Acked-by: Alice <alice@example.com>\n"
@@ -34862,45 +29761,40 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:297
-msgid ""
-"Extract the last commit as a patch, and add a 'Cc' and a 'Reviewed-by' "
-"trailer to it:"
+#, priority:100
+msgid "Extract the last commit as a patch, and add a 'Cc' and a 'Reviewed-by' trailer to it:"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:302
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git format-patch -1\n"
"0001-foo.patch\n"
-"$ git interpret-trailers --trailer 'Cc: Alice <alice@example.com>' --trailer "
-"'Reviewed-by: Bob <bob@example.com>' 0001-foo.patch >0001-bar.patch\n"
+"$ git interpret-trailers --trailer 'Cc: Alice <alice@example.com>' --trailer 'Reviewed-by: Bob <bob@example.com>' 0001-foo.patch >0001-bar.patch\n"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:307
-msgid ""
-"Configure a 'sign' trailer with a command to automatically add a "
-"'Signed-off-by: ' with the author information only if there is no "
-"'Signed-off-by: ' already, and show how it works:"
+#, priority:100
+msgid "Configure a 'sign' trailer with a command to automatically add a 'Signed-off-by: ' with the author information only if there is no 'Signed-off-by: ' already, and show how it works:"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:315
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git config trailer.sign.key \"Signed-off-by: \"\n"
"$ git config trailer.sign.ifmissing add\n"
"$ git config trailer.sign.ifexists doNothing\n"
-"$ git config trailer.sign.command 'echo \"$(git config user.name) <$(git "
-"config user.email)>\"'\n"
+"$ git config trailer.sign.command 'echo \"$(git config user.name) <$(git config user.email)>\"'\n"
"$ git interpret-trailers <<EOF\n"
"> EOF\n"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:320
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Signed-off-by: Bob <bob@example.com>\n"
"$ git interpret-trailers <<EOF\n"
@@ -34910,20 +29804,19 @@ msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:322
-#, no-wrap
+#, no-wrap, priority:100
msgid "Signed-off-by: Alice <alice@example.com>\n"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:326
-msgid ""
-"Configure a 'fix' trailer with a key that contains a '#' and no space after "
-"this character, and show how it works:"
+#, priority:100
+msgid "Configure a 'fix' trailer with a key that contains a '#' and no space after this character, and show how it works:"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:332
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git config trailer.separators \":#\"\n"
"$ git config trailer.fix.key \"Fix #\"\n"
@@ -34933,26 +29826,24 @@ msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:334
-#, no-wrap
+#, no-wrap, priority:100
msgid "Fix #42\n"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:338
-msgid ""
-"Configure a 'see' trailer with a command to show the subject of a commit "
-"that is related, and show how it works:"
+#, priority:100
+msgid "Configure a 'see' trailer with a command to show the subject of a commit that is related, and show how it works:"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:352
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git config trailer.see.key \"See-also: \"\n"
"$ git config trailer.see.ifExists \"replace\"\n"
"$ git config trailer.see.ifMissing \"doNothing\"\n"
-"$ git config trailer.see.command \"git log -1 --oneline --format=\\\"%h "
-"(%s)\\\" --abbrev-commit --abbrev=14 \\$ARG\"\n"
+"$ git config trailer.see.command \"git log -1 --oneline --format=\\\"%h (%s)\\\" --abbrev-commit --abbrev=14 \\$ARG\"\n"
"$ git interpret-trailers <<EOF\n"
"> subject\n"
"> \n"
@@ -34965,22 +29856,19 @@ msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:356
-#, no-wrap
+#, no-wrap, priority:100
msgid "See-also: fe3187489d69c4 (subject of related commit)\n"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:363
-msgid ""
-"Configure a commit template with some trailers with empty values (using sed "
-"to show and keep the trailing spaces at the end of the trailers), then "
-"configure a commit-msg hook that uses 'git interpret-trailers' to remove "
-"trailers with empty values and to add a 'git-version' trailer:"
+#, priority:100
+msgid "Configure a commit template with some trailers with empty values (using sed to show and keep the trailing spaces at the end of the trailers), then configure a commit-msg hook that uses 'git interpret-trailers' to remove trailers with empty values and to add a 'git-version' trailer:"
msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:382
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ sed -e 's/ Z$/ /' >commit_template.txt <<EOF\n"
"> ***subject***\n"
@@ -34995,8 +29883,7 @@ msgid ""
"$ git config commit.template commit_template.txt\n"
"$ cat >.git/hooks/commit-msg <<EOF\n"
"> #!/bin/sh\n"
-"> git interpret-trailers --trim-empty --trailer \"git-version: \\$(git "
-"describe)\" \"\\$1\" > \"\\$1.new\"\n"
+"> git interpret-trailers --trim-empty --trailer \"git-version: \\$(git describe)\" \"\\$1\" > \"\\$1.new\"\n"
"> mv \"\\$1.new\" \"\\$1\"\n"
"> EOF\n"
"$ chmod +x .git/hooks/commit-msg\n"
@@ -35006,526 +29893,449 @@ msgstr ""
#: en/git-interpret-trailers.txt:387
#, ignore-same, priority:100
msgid "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
-msgstr ""
-"linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
+msgstr "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
#. type: Title =
#: en/git-log.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "git-log(1)"
msgstr "git-log(1)"
#. type: Plain text
#: en/git-log.txt:7
+#, priority:260
msgid "git-log - Show commit logs"
msgstr ""
#. type: Plain text
#: en/git-log.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n"
msgstr "git log [<opciones>] [<rango-de-revisi처n>] [[--] <ruta>...]"
#. type: Plain text
#: en/git-log.txt:17
+#, priority:260
msgid "Shows the commit logs."
msgstr ""
#. type: Plain text
#: en/git-log.txt:22
-msgid ""
-"The command takes options applicable to the `git rev-list` command to "
-"control what is shown and how, and options applicable to the `git diff-*` "
-"commands to control how the changes each commit introduces are shown."
+#, priority:260
+msgid "The command takes options applicable to the `git rev-list` command to control what is shown and how, and options applicable to the `git diff-*` commands to control how the changes each commit introduces are shown."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--follow"
msgstr "--follow"
#. type: Plain text
#: en/git-log.txt:30
-msgid ""
-"Continue listing the history of a file beyond renames (works only for a "
-"single file)."
+#, priority:260
+msgid "Continue listing the history of a file beyond renames (works only for a single file)."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-decorate"
msgstr "--no-decorate"
#. type: Labeled list
#: en/git-log.txt:32
-#, no-wrap
+#, no-wrap, priority:260
msgid "--decorate[=short|full|auto|no]"
msgstr ""
#. type: Plain text
#: en/git-log.txt:40
-msgid ""
-"Print out the ref names of any commits that are shown. If 'short' is "
-"specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and "
-"'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
-"name (including prefix) will be printed. If 'auto' is specified, then if the "
-"output is going to a terminal, the ref names are shown as if 'short' were "
-"given, otherwise no ref names are shown. The default option is 'short'."
+#, priority:260
+msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:41
-#, no-wrap
+#, no-wrap, priority:260
msgid "--decorate-refs=<pattern>"
msgstr ""
#. type: Labeled list
#: en/git-log.txt:42
-#, no-wrap
+#, no-wrap, priority:260
msgid "--decorate-refs-exclude=<pattern>"
msgstr ""
#. type: Plain text
#: en/git-log.txt:47
-msgid ""
-"If no `--decorate-refs` is given, pretend as if all refs were included. For "
-"each candidate, do not use it for decoration if it matches any patterns "
-"given to `--decorate-refs-exclude` or if it doesn't match any of the "
-"patterns given to `--decorate-refs`."
+#, priority:260
+msgid "If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--source"
msgstr "--source"
#. type: Plain text
#: en/git-log.txt:51
-msgid ""
-"Print out the ref name given on the command line by which each commit was "
-"reached."
+#, priority:260
+msgid "Print out the ref name given on the command line by which each commit was reached."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:52
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--[no-]use-mailmap"
msgstr "--[no-]use-mailmap"
#. type: Plain text
#: en/git-log.txt:56
-msgid ""
-"Use mailmap file to map author and committer names and email addresses to "
-"canonical real names and email addresses. See linkgit:git-shortlog[1]."
+#, priority:260
+msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:57
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--full-diff"
msgstr "--full-diff"
#. type: Plain text
#: en/git-log.txt:63
-msgid ""
-"Without this flag, `git log -p <path>...` shows commits that touch the "
-"specified paths, and diffs about the same specified paths. With this, the "
-"full diff is shown for commits that touch the specified paths; this means "
-"that \"<path>...\" limits only commits, and doesn't limit diff for those "
-"commits."
+#, ignore-ellipsis, priority:260
+msgid "Without this flag, `git log -p <path>...` shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths; this means that \"<path>...\" limits only commits, and doesn't limit diff for those commits."
msgstr ""
#. type: Plain text
#: en/git-log.txt:66
-msgid ""
-"Note that this affects all diff-based output types, e.g. those produced by "
-"`--stat`, etc."
+#, priority:260
+msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:67
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--log-size"
msgstr "--log-size"
#. type: Plain text
#: en/git-log.txt:72
-msgid ""
-"Include a line ``log size <number>'' in the output for each commit, where "
-"<number> is the length of that commit's message in bytes. Intended to speed "
-"up tools that read log messages from `git log` output by allowing them to "
-"allocate space in advance."
+#, priority:260
+msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes. Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:73
-#, no-wrap
+#, no-wrap, priority:260
msgid "-L <start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-log.txt:74
-#, no-wrap
+#, no-wrap, priority:260
msgid "-L :<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/git-log.txt:85
-msgid ""
-"Trace the evolution of the line range given by \"<start>,<end>\" (or the "
-"function name regex <funcname>) within the <file>. You may not give any "
-"pathspec limiters. This is currently limited to a walk starting from a "
-"single revision, i.e., you may only give zero or one positive revision "
-"arguments, and <start> and <end> (or <funcname>) must exist in the starting "
-"revision. You can specify this option more than once. Implies `--patch`. "
-"Patch output can be suppressed using `--no-patch`, but other diff formats "
-"(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, "
-"`--name-only`, `--name-status`, `--check`) are not currently implemented."
+#, priority:260
+msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and <start> and <end> (or <funcname>) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:88 en/git-shortlog.txt:63
-#, no-wrap
+#, no-wrap, priority:260
msgid "<revision range>"
msgstr ""
#. type: Plain text
#: en/git-log.txt:96
-msgid ""
-"Show only commits in the specified revision range. When no <revision range> "
-"is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
-"current commit). `origin..HEAD` specifies all the commits reachable from "
-"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list "
-"of ways to spell <revision range>, see the 'Specifying Ranges' section of "
-"linkgit:gitrevisions[7]."
+#, priority:260
+msgid "Show only commits in the specified revision range. When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit). `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:97 en/git-shortlog.txt:72
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:260
msgid "[--] <path>..."
msgstr ""
#. type: Plain text
#: en/git-log.txt:102
-msgid ""
-"Show only commits that are enough to explain how the files that match the "
-"specified paths came to be. See 'History Simplification' below for details "
-"and other simplification modes."
+#, priority:260
+msgid "Show only commits that are enough to explain how the files that match the specified paths came to be. See 'History Simplification' below for details and other simplification modes."
msgstr ""
#. type: Plain text
#: en/git-log.txt:105 en/git-shortlog.txt:78
-msgid ""
-"Paths may need to be prefixed with `--` to separate them from options or the "
-"revision range, when confusion arises."
+#, priority:260
+msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
msgstr ""
#. type: Title -
#: en/git-log.txt:111 en/git-show.txt:49
-#, no-wrap
+#, no-wrap, priority:260
msgid "COMMON DIFF OPTIONS"
msgstr ""
#. type: Labeled list
#: en/git-log.txt:120
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log --no-merges`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:123
+#, priority:260
msgid "Show the whole commit history, but skip any merges"
msgstr ""
#. type: Labeled list
#: en/git-log.txt:124
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:128
-msgid ""
-"Show all commits since version 'v2.6.12' that changed any file in the "
-"`include/scsi` or `drivers/scsi` subdirectories"
+#, priority:260
+msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
msgstr ""
#. type: Labeled list
#: en/git-log.txt:129
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log --since=\"2 weeks ago\" -- gitk`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:134
-msgid ""
-"Show the changes during the last two weeks to the file 'gitk'. The `--` is "
-"necessary to avoid confusion with the *branch* named 'gitk'"
+#, priority:260
+msgid "Show the changes during the last two weeks to the file 'gitk'. The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
msgstr ""
#. type: Labeled list
#: en/git-log.txt:135
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log --name-status release..test`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:140
-msgid ""
-"Show the commits that are in the \"test\" branch but not yet in the "
-"\"release\" branch, along with the list of paths each commit modifies."
+#, priority:260
+msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:141
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log --follow builtin/rev-list.c`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:146
-msgid ""
-"Shows the commits that changed `builtin/rev-list.c`, including those commits "
-"that occurred before the file was given its present name."
+#, priority:260
+msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:147
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log --branches --not --remotes=origin`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:152
-msgid ""
-"Shows all commits that are in any of local branches but not in any of "
-"remote-tracking branches for 'origin' (what you have that origin doesn't)."
+#, priority:260
+msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:153
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log master --not --remotes=*/master`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:157
-msgid ""
-"Shows all commits that are in local master but not in any remote repository "
-"master branches."
+#, priority:260
+msgid "Shows all commits that are in local master but not in any remote repository master branches."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:158
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log -p -m --first-parent`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:165
-msgid ""
-"Shows the history including change diffs, but only from the ``main branch'' "
-"perspective, skipping commits that come from merged branches, and showing "
-"full diffs of changes introduced by the merges. This makes sense only when "
-"following a strict policy of merging all topic branches when staying on a "
-"single integration branch."
+#, priority:260
+msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges. This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:166
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log -L '/int main/',/^}/:main.c`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:170
+#, priority:260
msgid "Shows how the function `main()` in the file `main.c` evolved over time."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:171
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git log -3`"
msgstr ""
#. type: Plain text
#: en/git-log.txt:174
+#, priority:260
msgid "Limits the number of commits to show to 3."
msgstr ""
#. type: Plain text
#: en/git-log.txt:185
-msgid ""
-"See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for "
-"settings related to diff generation."
+#, priority:260
+msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:186
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "format.pretty"
msgstr "format.pretty"
#. type: Plain text
#: en/git-log.txt:189
-msgid ""
-"Default for the `--format` option. (See 'Pretty Formats' above.) Defaults "
-"to `medium`."
+#, priority:260
+msgid "Default for the `--format` option. (See 'Pretty Formats' above.) Defaults to `medium`."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:190
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
#. type: Plain text
#: en/git-log.txt:194
-msgid ""
-"Encoding to use when displaying logs. (See 'Discussion' above.) Defaults "
-"to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
+#, priority:260
+msgid "Encoding to use when displaying logs. (See 'Discussion' above.) Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:195
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "log.date"
msgstr "log.date"
#. type: Plain text
#: en/git-log.txt:199
-msgid ""
-"Default format for human-readable dates. (Compare the `--date` option.) "
-"Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 "
-"2010 -0500`."
+#, priority:260
+msgid "Default format for human-readable dates. (Compare the `--date` option.) Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
msgstr ""
#. type: Plain text
#: en/git-log.txt:203
-msgid ""
-"If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" "
-"will be the used for the date format. Otherwise \"default\" will be used."
+#, priority:260
+msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:204
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "log.follow"
msgstr "log.follow"
#. type: Plain text
#: en/git-log.txt:209
-msgid ""
-"If `true`, `git log` will act as if the `--follow` option was used when a "
-"single <path> is given. This has the same limitations as `--follow`, "
-"i.e. it cannot be used to follow multiple files and does not work well on "
-"non-linear history."
+#, priority:260
+msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:210
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "log.showRoot"
msgstr "log.showRoot"
#. type: Plain text
#: en/git-log.txt:215
-msgid ""
-"If `false`, `git log` and related commands will not treat the initial commit "
-"as a big creation event. Any root commits in `git log -p` output would be "
-"shown without a diff attached. The default is `true`."
+#, priority:260
+msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event. Any root commits in `git log -p` output would be shown without a diff attached. The default is `true`."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:216
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "log.showSignature"
msgstr "log.showSignature"
#. type: Plain text
#: en/git-log.txt:219
-msgid ""
-"If `true`, `git log` and related commands will act as if the "
-"`--show-signature` option was passed to them."
+#, priority:260
+msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:220
-#, no-wrap
+#, no-wrap, priority:260
msgid "mailmap.*"
msgstr ""
#. type: Plain text
#: en/git-log.txt:222
-#, fuzzy
+#, fuzzy, priority:260
msgid "See linkgit:git-shortlog[1]."
msgstr "linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:223 en/git-notes.txt:333
-#, no-wrap
+#, no-wrap, priority:260
msgid "notes.displayRef"
msgstr ""
#. type: Plain text
#: en/git-log.txt:228
-msgid ""
-"Which refs, in addition to the default set by `core.notesRef` or "
-"`GIT_NOTES_REF`, to read notes from when showing commit messages with the "
-"`log` family of commands. See linkgit:git-notes[1]."
+#, priority:260
+msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands. See linkgit:git-notes[1]."
msgstr ""
#. type: Plain text
#: en/git-log.txt:232
-msgid ""
-"May be an unabbreviated ref name or a glob and may be specified multiple "
-"times. A warning will be issued for refs that do not exist, but a glob that "
-"does not match any refs is silently ignored."
+#, priority:260
+msgid "May be an unabbreviated ref name or a glob and may be specified multiple times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
msgstr ""
#. type: Plain text
#: en/git-log.txt:236
-msgid ""
-"This setting can be disabled by the `--no-notes` option, overridden by the "
-"`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the "
-"`--notes=<ref>` option."
+#, priority:260
+msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-ls-files(1)"
msgstr "git-ls-files(1)"
#. type: Plain text
#: en/git-ls-files.txt:7
-#, fuzzy
-msgid ""
-"git-ls-files - Show information about files in the index and the working "
-"tree"
+#, fuzzy, priority:100
+msgid "git-ls-files - Show information about files in the index and the working tree"
msgstr "Muestra informaci처n sobre archivos in el 챠ndice y el 찼rbol de trabajo"
#. type: Plain text
#: en/git-ls-files.txt:23
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-files' [-z] [-t] [-v] [-f]\n"
"\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n"
@@ -35542,430 +30352,391 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:29
-msgid ""
-"This merges the file listing in the directory cache index with the actual "
-"working directory list, and shows different combinations of the two."
+#, priority:100
+msgid "This merges the file listing in the directory cache index with the actual working directory list, and shows different combinations of the two."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:32
+#, priority:100
msgid "One or more of the options below may be used to determine the files shown:"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:38
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show cached files in the output (default)"
msgstr "mostrar archivos en cach챕 en la salida (default)"
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--deleted"
msgstr "--deleted"
#. type: Plain text
#: en/git-ls-files.txt:42
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show deleted files in the output"
msgstr "mostrar archivos borrados en la salida"
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--modified"
msgstr "--modified"
#. type: Plain text
#: en/git-ls-files.txt:46
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show modified files in the output"
msgstr "mostrar archivos modificados en la salida"
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--others"
msgstr "--others"
#. type: Plain text
#: en/git-ls-files.txt:50
+#, priority:100
msgid "Show other (i.e. untracked) files in the output"
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--ignored"
msgstr "--ignored"
#. type: Plain text
#: en/git-ls-files.txt:58
-msgid ""
-"Show only ignored files in the output. When showing files in the index, "
-"print only those matched by an exclude pattern. When showing \"other\" "
-"files, show only those matched by an exclude pattern. Standard ignore rules "
-"are not automatically activated, therefore at least one of the `--exclude*` "
-"options is required."
+#, priority:100
+msgid "Show only ignored files in the output. When showing files in the index, print only those matched by an exclude pattern. When showing \"other\" files, show only those matched by an exclude pattern. Standard ignore rules are not automatically activated, therefore at least one of the `--exclude*` options is required."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stage"
msgstr "--stage"
#. type: Plain text
#: en/git-ls-files.txt:62
+#, priority:100
msgid "Show staged contents' mode bits, object name and stage number in the output."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:63
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--directory"
msgstr "--directory"
#. type: Plain text
#: en/git-ls-files.txt:66
-msgid ""
-"If a whole directory is classified as \"other\", show just its name (with a "
-"trailing slash) and not its whole contents."
+#, priority:100
+msgid "If a whole directory is classified as \"other\", show just its name (with a trailing slash) and not its whole contents."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:67
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-empty-directory"
msgstr "--no-empty-directory"
#. type: Plain text
#: en/git-ls-files.txt:69
+#, priority:100
msgid "Do not list empty directories. Has no effect without --directory."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:71 en/git-update-index.txt:68
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unmerged"
msgstr "--unmerged"
#. type: Plain text
#: en/git-ls-files.txt:73
+#, priority:100
msgid "Show unmerged files in the output (forces --stage)"
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:75
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--killed"
msgstr "--killed"
#. type: Plain text
#: en/git-ls-files.txt:79
-msgid ""
-"Show files on the filesystem that need to be removed due to file/directory "
-"conflicts for checkout-index to succeed."
+#, priority:100
+msgid "Show files on the filesystem that need to be removed due to file/directory conflicts for checkout-index to succeed."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:83
-msgid ""
-"\\0 line termination on output and do not quote filenames. See OUTPUT below "
-"for more information."
+#, priority:100
+msgid "\\0 line termination on output and do not quote filenames. See OUTPUT below for more information."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:84
-#, no-wrap
+#, no-wrap, priority:100
msgid "-x <pattern>"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:89
-msgid ""
-"Skip untracked files matching pattern. Note that pattern is a shell "
-"wildcard pattern. See EXCLUDE PATTERNS below for more information."
+#, priority:100
+msgid "Skip untracked files matching pattern. Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS below for more information."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:90
-#, no-wrap
+#, no-wrap, priority:100
msgid "-X <file>"
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:91
-#, no-wrap
+#, no-wrap, priority:100
msgid "--exclude-from=<file>"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:93
+#, priority:100
msgid "Read exclude patterns from <file>; 1 per line."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:94
-#, no-wrap
+#, no-wrap, priority:100
msgid "--exclude-per-directory=<file>"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:97
-msgid ""
-"Read additional exclude patterns that apply only to the directory and its "
-"subdirectories in <file>."
+#, priority:100
+msgid "Read additional exclude patterns that apply only to the directory and its subdirectories in <file>."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:101
-msgid ""
-"Add the standard Git exclusions: .git/info/exclude, .gitignore in each "
-"directory, and the user's global exclusion file."
+#, priority:100
+msgid "Add the standard Git exclusions: .git/info/exclude, .gitignore in each directory, and the user's global exclusion file."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:102
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--error-unmatch"
msgstr "--error-unmatch"
#. type: Plain text
#: en/git-ls-files.txt:105
-msgid ""
-"If any <file> does not appear in the index, treat this as an error (return "
-"1)."
+#, priority:100
+msgid "If any <file> does not appear in the index, treat this as an error (return 1)."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:106
-#, no-wrap
+#, no-wrap, priority:100
msgid "--with-tree=<tree-ish>"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:112
-msgid ""
-"When using --error-unmatch to expand the user supplied <file> (i.e. path "
-"pattern) arguments to paths, pretend that paths which were removed in the "
-"index since the named <tree-ish> are still present. Using this option with "
-"`-s` or `-u` options does not make any sense."
+#, priority:100
+msgid "When using --error-unmatch to expand the user supplied <file> (i.e. path pattern) arguments to paths, pretend that paths which were removed in the index since the named <tree-ish> are still present. Using this option with `-s` or `-u` options does not make any sense."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:120
-msgid ""
-"This feature is semi-deprecated. For scripting purpose, "
-"linkgit:git-status[1] `--porcelain` and linkgit:git-diff-files[1] "
-"`--name-status` are almost always superior alternatives, and users should "
-"look at linkgit:git-status[1] `--short` or linkgit:git-diff[1] "
-"`--name-status` for more user-friendly alternatives."
+#, priority:100
+msgid "This feature is semi-deprecated. For scripting purpose, linkgit:git-status[1] `--porcelain` and linkgit:git-diff-files[1] `--name-status` are almost always superior alternatives, and users should look at linkgit:git-status[1] `--short` or linkgit:git-diff[1] `--name-status` for more user-friendly alternatives."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:124
-msgid ""
-"This option identifies the file status with the following tags (followed by "
-"a space) at the start of each line:"
+#, priority:100
+msgid "This option identifies the file status with the following tags (followed by a space) at the start of each line:"
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:125
-#, no-wrap
+#, no-wrap, priority:100
msgid "H"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:126
-#, fuzzy
+#, fuzzy, priority:100
msgid "cached"
msgstr "--cached"
#. type: Labeled list
#: en/git-ls-files.txt:126
-#, no-wrap
+#, no-wrap, priority:100
msgid "S"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:127
+#, priority:100
msgid "skip-worktree"
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:127
-#, no-wrap
+#, no-wrap, priority:100
msgid "M"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:128
-#, fuzzy
+#, fuzzy, priority:100
msgid "unmerged"
msgstr "--unmerged"
#. type: Labeled list
#: en/git-ls-files.txt:128
-#, no-wrap
+#, no-wrap, priority:100
msgid "R"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:129
+#, priority:100
msgid "removed/deleted"
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:129
-#, no-wrap
+#, no-wrap, priority:100
msgid "C"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:130
+#, priority:100
msgid "modified/changed"
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:130
-#, no-wrap
+#, no-wrap, priority:100
msgid "K"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:131
+#, priority:100
msgid "to be killed"
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:131
-#, no-wrap
+#, no-wrap, priority:100
msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
-#, fuzzy, no-wrap
+#: en/git-ls-files.txt:132 en/git.txt:572
+#, fuzzy, no-wrap, priority:100
msgid "other"
msgstr "Otro"
#. type: Plain text
#: en/git-ls-files.txt:138
-msgid ""
-"Similar to `-t`, but use lowercase letters for files that are marked as "
-"'assume unchanged' (see linkgit:git-update-index[1])."
+#, priority:100
+msgid "Similar to `-t`, but use lowercase letters for files that are marked as 'assume unchanged' (see linkgit:git-update-index[1])."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:143
-msgid ""
-"Similar to `-t`, but use lowercase letters for files that are marked as "
-"'fsmonitor valid' (see linkgit:git-update-index[1])."
+#, priority:100
+msgid "Similar to `-t`, but use lowercase letters for files that are marked as 'fsmonitor valid' (see linkgit:git-update-index[1])."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:153
-msgid ""
-"Recursively calls ls-files on each submodule in the repository. Currently "
-"there is only support for the --cached mode."
+#, priority:100
+msgid "Recursively calls ls-files on each submodule in the repository. Currently there is only support for the --cached mode."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:158 en/git-ls-tree.txt:67
-msgid ""
-"Instead of showing the full 40-byte hexadecimal object lines, show only a "
-"partial prefix. Non default number of digits can be specified with "
-"--abbrev=<n>."
+#, priority:100
+msgid "Instead of showing the full 40-byte hexadecimal object lines, show only a partial prefix. Non default number of digits can be specified with --abbrev=<n>."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:164
-msgid ""
-"After each line that describes a file, add more data about its cache entry. "
-"This is intended to show as much information as possible for manual "
-"inspection; the exact format may change at any time."
+#, priority:100
+msgid "After each line that describes a file, add more data about its cache entry. This is intended to show as much information as possible for manual inspection; the exact format may change at any time."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:165
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--eol"
msgstr "--eol"
#. type: Plain text
#: en/git-ls-files.txt:170
-msgid ""
-"Show <eolinfo> and <eolattr> of files. <eolinfo> is the file content "
-"identification used by Git when the \"text\" attribute is \"auto\" (or not "
-"set and core.autocrlf is not false). <eolinfo> is either \"-text\", "
-"\"none\", \"lf\", \"crlf\", \"mixed\" or \"\"."
+#, priority:100
+msgid "Show <eolinfo> and <eolattr> of files. <eolinfo> is the file content identification used by Git when the \"text\" attribute is \"auto\" (or not set and core.autocrlf is not false). <eolinfo> is either \"-text\", \"none\", \"lf\", \"crlf\", \"mixed\" or \"\"."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:173
-msgid ""
-"\"\" means the file is not a regular file, it is not in the index or not "
-"accessible in the working tree."
+#, priority:100
+msgid "\"\" means the file is not a regular file, it is not in the index or not accessible in the working tree."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:177
-msgid ""
-"<eolattr> is the attribute that is used when checking out or committing, it "
-"is either \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text "
-"eol=crlf\". Since Git 2.10 \"text=auto eol=lf\" and \"text=auto eol=crlf\" "
-"are supported."
+#, priority:100
+msgid "<eolattr> is the attribute that is used when checking out or committing, it is either \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text eol=crlf\". Since Git 2.10 \"text=auto eol=lf\" and \"text=auto eol=crlf\" are supported."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:181
-msgid ""
-"Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tree "
-"(\"w/<eolinfo>\") are shown for regular files, followed by the "
-"(\"attr/<eolattr>\")."
+#, priority:100
+msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tree (\"w/<eolinfo>\") are shown for regular files, followed by the (\"attr/<eolattr>\")."
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
-#, no-wrap
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
+#, no-wrap, priority:100
msgid "<file>"
msgstr "<archivo>"
#. type: Plain text
#: en/git-ls-files.txt:188
-msgid ""
-"Files to show. If no files are given all files which match the other "
-"specified criteria are shown."
+#, priority:100
+msgid "Files to show. If no files are given all files which match the other specified criteria are shown."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:193
-msgid ""
-"'git ls-files' just outputs the filenames unless `--stage` is specified in "
-"which case it outputs:"
+#, priority:100
+msgid "'git ls-files' just outputs the filenames unless `--stage` is specified in which case it outputs:"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:195
-#, no-wrap
+#, no-wrap, priority:100
msgid " [<tag> ]<mode> <object> <stage> <file>\n"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:198
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git ls-files --eol' will show\n"
"\ti/<eolinfo><SPACES>w/<eolinfo><SPACES>attr/<eolattr><SPACE*><TAB><file>\n"
@@ -35973,72 +30744,56 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:201
-msgid ""
-"'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine "
-"detailed information on unmerged paths."
+#, priority:100
+msgid "'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine detailed information on unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:207
-msgid ""
-"For an unmerged path, instead of recording a single mode/SHA-1 pair, the "
-"index records up to three such pairs; one from tree O in stage 1, A in stage "
-"2, and B in stage 3. This information can be used by the user (or the "
-"porcelain) to see what should eventually be recorded at the path. (see "
-"linkgit:git-read-tree[1] for more information on state)"
+#, priority:100
+msgid "For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see linkgit:git-read-tree[1] for more information on state)"
msgstr ""
#. type: Title -
#: en/git-ls-files.txt:215
-#, no-wrap
+#, no-wrap, priority:100
msgid "EXCLUDE PATTERNS"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:221
-msgid ""
-"'git ls-files' can use a list of \"exclude patterns\" when traversing the "
-"directory tree and finding files to show when the flags --others or "
-"--ignored are specified. linkgit:gitignore[5] specifies the format of "
-"exclude patterns."
+#, priority:100
+msgid "'git ls-files' can use a list of \"exclude patterns\" when traversing the directory tree and finding files to show when the flags --others or --ignored are specified. linkgit:gitignore[5] specifies the format of exclude patterns."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:223
+#, priority:100
msgid "These exclude patterns come from these places, in order:"
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:227
-msgid ""
-"The command-line flag --exclude=<pattern> specifies a single pattern. "
-"Patterns are ordered in the same order they appear in the command line."
+#, priority:100
+msgid "The command-line flag --exclude=<pattern> specifies a single pattern. Patterns are ordered in the same order they appear in the command line."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:231
-msgid ""
-"The command-line flag --exclude-from=<file> specifies a file containing a "
-"list of patterns. Patterns are ordered in the same order they appear in the "
-"file."
+#, priority:100
+msgid "The command-line flag --exclude-from=<file> specifies a file containing a list of patterns. Patterns are ordered in the same order they appear in the file."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:237
-msgid ""
-"The command-line flag --exclude-per-directory=<name> specifies a name of the "
-"file in each directory 'git ls-files' examines, normally `.gitignore`. "
-"Files in deeper directories take precedence. Patterns are ordered in the "
-"same order they appear in the files."
+#, priority:100
+msgid "The command-line flag --exclude-per-directory=<name> specifies a name of the file in each directory 'git ls-files' examines, normally `.gitignore`. Files in deeper directories take precedence. Patterns are ordered in the same order they appear in the files."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:243
-msgid ""
-"A pattern specified on the command line with --exclude or read from the file "
-"specified with --exclude-from is relative to the top of the directory tree. "
-"A pattern read from a file specified by --exclude-per-directory is relative "
-"to the directory that the pattern file appears in."
+#, priority:100
+msgid "A pattern specified on the command line with --exclude or read from the file specified with --exclude-from is relative to the top of the directory tree. A pattern read from a file specified by --exclude-per-directory is relative to the directory that the pattern file appears in."
msgstr ""
#. type: Plain text
@@ -36049,19 +30804,19 @@ msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
#. type: Title =
#: en/git-ls-remote.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-ls-remote(1)"
msgstr "git-ls-remote(1)"
#. type: Plain text
#: en/git-ls-remote.txt:7
+#, priority:100
msgid "git-ls-remote - List references in a remote repository"
msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:15
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
"\t [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
@@ -36073,137 +30828,109 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:20
-msgid ""
-"Displays references available in a remote repository along with the "
-"associated commit IDs."
+#, priority:100
+msgid "Displays references available in a remote repository along with the associated commit IDs."
msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:40
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
-msgid ""
-"Limit to only refs/heads and refs/tags, respectively. These options are "
-"_not_ mutually exclusive; when given both, references stored in refs/heads "
-"and refs/tags are displayed."
+#: en/git-ls-remote.txt:34
+#, priority:100
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
-#, no-wrap
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
+#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
+#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
-#, no-wrap
+#: en/git-ls-remote.txt:42
+#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
-msgid ""
-"Specify the full path of 'git-upload-pack' on the remote host. This allows "
-"listing references from repositories accessed via SSH and where the SSH "
-"daemon does not use the PATH configured by the user."
+#: en/git-ls-remote.txt:47
+#, priority:100
+msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
-msgid ""
-"Exit with status \"2\" when no matching refs are found in the remote "
-"repository. Usually the command exits with status \"0\" to indicate it "
-"successfully talked with the remote repository, whether it found any "
-"matching refs."
+#: en/git-ls-remote.txt:53
+#, priority:100
+msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
-#, no-wrap
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
-msgid ""
-"Expand the URL of the given remote repository taking into account any "
-"\"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit "
-"without talking to the remote."
+#: en/git-ls-remote.txt:58
+#, priority:100
+msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
-#, no-wrap
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
-msgid ""
-"In addition to the object pointed by it, show the underlying ref pointed by "
-"it when showing a symbolic ref. Currently, upload-pack only shows the "
-"symref HEAD, so it will be the only one shown by ls-remote."
+#: en/git-ls-remote.txt:64
+#, priority:100
+msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
-msgid ""
-"Sort based on the key given. Prefix `-` to sort in descending order of the "
-"value. Supports \"version:refname\" or \"v:refname\" (tag names are treated "
-"as versions). The \"version:refname\" sort order can also be affected by the "
-"\"versionsort.suffix\" configuration variable. See "
-"linkgit:git-for-each-ref[1] for more sort options, but be aware keys like "
-"`committerdate` that require access to the objects themselves will not work "
-"for refs whose objects have not yet been fetched from the remote, and will "
-"give a `missing object` error."
+#: en/git-ls-remote.txt:74
+#, priority:100
+msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
-msgid ""
-"Transmit the given string to the server when communicating using protocol "
-"version 2. The given string must not contain a NUL or LF character. When "
-"multiple `--server-option=<option>` are given, they are all sent to the "
-"other side in the order listed on the command line."
+#: en/git-ls-remote.txt:82
+#, priority:100
+msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
-msgid ""
-"The \"remote\" repository to query. This parameter can be either a URL or "
-"the name of a remote (see the GIT URLS and REMOTES sections of "
-"linkgit:git-fetch[1])."
+#: en/git-ls-remote.txt:87
+#, priority:100
+msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
-msgid ""
-"When unspecified, all references, after filtering done with --heads and "
-"--tags, are shown. When <refs>... are specified, only references matching "
-"the given patterns are displayed."
+#: en/git-ls-remote.txt:93
+#, ignore-ellipsis, priority:100
+msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
-#, no-wrap
+#: en/git-ls-remote.txt:113
+#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36223,354 +30950,317 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
#. type: Title =
#: en/git-ls-tree.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-ls-tree(1)"
msgstr "git-ls-tree(1)"
#. type: Plain text
#: en/git-ls-tree.txt:7
+#, priority:100
msgid "git-ls-tree - List the contents of a tree object"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:15
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n"
-"\t [--name-only] [--name-status] [--full-name] [--full-tree] "
-"[--abbrev[=<n>]]\n"
+"\t [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]\n"
"\t <tree-ish> [<path>...]\n"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:20
-msgid ""
-"Lists the contents of a given tree object, like what \"/bin/ls -a\" does in "
-"the current working directory. Note that:"
+#, priority:100
+msgid "Lists the contents of a given tree object, like what \"/bin/ls -a\" does in the current working directory. Note that:"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:25
-msgid ""
-"the behaviour is slightly different from that of \"/bin/ls\" in that the "
-"'<path>' denotes just a list of patterns to match, e.g. so specifying "
-"directory name (without `-r`) will behave differently, and order of the "
-"arguments does not matter."
+#, priority:100
+msgid "the behaviour is slightly different from that of \"/bin/ls\" in that the '<path>' denotes just a list of patterns to match, e.g. so specifying directory name (without `-r`) will behave differently, and order of the arguments does not matter."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:35
-msgid ""
-"the behaviour is similar to that of \"/bin/ls\" in that the '<path>' is "
-"taken as relative to the current working directory. E.g. when you are in a "
-"directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD "
-"dir' to list the contents of the tree (that is `sub/dir` in `HEAD`). You "
-"don't want to give a tree that is not at the root level (e.g. `git ls-tree "
-"-r HEAD:sub dir`) in this case, as that would result in asking for "
-"`sub/sub/dir` in the `HEAD` commit. However, the current working directory "
-"can be ignored by passing --full-tree option."
+#, priority:100
+msgid "the behaviour is similar to that of \"/bin/ls\" in that the '<path>' is taken as relative to the current working directory. E.g. when you are in a directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD dir' to list the contents of the tree (that is `sub/dir` in `HEAD`). You don't want to give a tree that is not at the root level (e.g. `git ls-tree -r HEAD:sub dir`) in this case, as that would result in asking for `sub/sub/dir` in the `HEAD` commit. However, the current working directory can be ignored by passing --full-tree option."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:40
+#, priority:100
msgid "Id of a tree-ish."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:43
+#, priority:100
msgid "Show only the named tree entry itself, not its children."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:46
-#, fuzzy
+#, fuzzy, priority:100
msgid "Recurse into sub-trees."
msgstr "recurrir en sub찼rboles"
#. type: Plain text
#: en/git-ls-tree.txt:50
-msgid ""
-"Show tree entries even when going to recurse them. Has no effect if `-r` was "
-"not passed. `-d` implies `-t`."
+#, priority:100
+msgid "Show tree entries even when going to recurse them. Has no effect if `-r` was not passed. `-d` implies `-t`."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:54
+#, priority:100
msgid "Show object size of blob (file) entries."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:58
-msgid ""
-"\\0 line termination on output and do not quote filenames. See OUTPUT "
-"FORMAT below for more information."
+#, priority:100
+msgid "\\0 line termination on output and do not quote filenames. See OUTPUT FORMAT below for more information."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:62
+#, priority:100
msgid "List only filenames (instead of the \"long\" output), one per line."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:71
-msgid ""
-"Instead of showing the path names relative to the current working directory, "
-"show the full path names."
+#, priority:100
+msgid "Instead of showing the path names relative to the current working directory, show the full path names."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:75
-msgid ""
-"Do not limit the listing to the current working directory. Implies "
-"--full-name."
+#, priority:100
+msgid "Do not limit the listing to the current working directory. Implies --full-name."
msgstr ""
#. type: Labeled list
#: en/git-ls-tree.txt:76
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<path>...]"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:80
-msgid ""
-"When paths are given, show them (note that this isn't really raw pathnames, "
-"but rather a list of patterns to match). Otherwise implicitly uses the root "
-"level of the tree as the sole path argument."
+#, priority:100
+msgid "When paths are given, show them (note that this isn't really raw pathnames, but rather a list of patterns to match). Otherwise implicitly uses the root level of the tree as the sole path argument."
msgstr ""
#. type: Title -
#: en/git-ls-tree.txt:83
-#, no-wrap
+#, no-wrap, priority:100
msgid "Output Format"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:85
-#, no-wrap
+#, no-wrap, priority:100
msgid " <mode> SP <type> SP <object> TAB <file>\n"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:88
-msgid ""
-"This output format is compatible with what `--index-info --stdin` of 'git "
-"update-index' expects."
+#, priority:100
+msgid "This output format is compatible with what `--index-info --stdin` of 'git update-index' expects."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:90
+#, priority:100
msgid "When the `-l` option is used, format changes to"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:92
-#, no-wrap
+#, no-wrap, priority:100
msgid " <mode> SP <type> SP <object> SP <object size> TAB <file>\n"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:96
-msgid ""
-"Object size identified by <object> is given in bytes, and right-justified "
-"with minimum width of 7 characters. Object size is given only for blobs "
-"(file) entries; for other entries `-` character is used in place of size."
+#, priority:100
+msgid "Object size identified by <object> is given in bytes, and right-justified with minimum width of 7 characters. Object size is given only for blobs (file) entries; for other entries `-` character is used in place of size."
msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-mailinfo(1)"
msgstr "git-mailinfo(1)"
#. type: Plain text
#: en/git-mailinfo.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
msgstr "Extraer parche y autor챠a de un 첬nico mensaje de e-mail"
#. type: Plain text
#: en/git-mailinfo.txt:13
-#, no-wrap
-msgid ""
-"'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] "
-"<msg> <patch>\n"
+#, no-wrap, priority:100
+msgid "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch>\n"
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:23
-msgid ""
-"Reads a single e-mail message from the standard input, and writes the commit "
-"log message in <msg> file, and the patches in <patch> file. The author "
-"name, e-mail and e-mail subject are written out to the standard output to be "
-"used by 'git am' to create a commit. It is usually not necessary to use "
-"this command directly. See linkgit:git-am[1] instead."
+#, priority:100
+msgid "Reads a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are written out to the standard output to be used by 'git am' to create a commit. It is usually not necessary to use this command directly. See linkgit:git-am[1] instead."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:32
-msgid ""
-"Usually the program removes email cruft from the Subject: header line to "
-"extract the title line for the commit log message. This option prevents "
-"this munging, and is most useful when used to read back 'git format-patch "
-"-k' output."
+#, priority:100
+msgid "Usually the program removes email cruft from the Subject: header line to extract the title line for the commit log message. This option prevents this munging, and is most useful when used to read back 'git format-patch -k' output."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:34
+#, priority:100
msgid "Specifically, the following are removed until none of them remain:"
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:37
+#, priority:100
msgid "Leading and trailing whitespace."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:39
+#, priority:100
msgid "Leading `Re:`, `re:`, and `:`."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:41
+#, priority:100
msgid "Leading bracketed strings (between `[` and `]`, usually"
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:42
+#, priority:100
msgid "`[PATCH]`)."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:46
-msgid ""
-"Finally, runs of whitespace are normalized to a single ASCII space "
-"character."
+#, priority:100
+msgid "Finally, runs of whitespace are normalized to a single ASCII space character."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:51
-msgid ""
-"When -k is not in effect, all leading strings bracketed with '[' and ']' "
-"pairs are stripped. This option limits the stripping to only the pairs "
-"whose bracketed string contains the word \"PATCH\"."
+#, priority:100
+msgid "When -k is not in effect, all leading strings bracketed with '[' and ']' pairs are stripped. This option limits the stripping to only the pairs whose bracketed string contains the word \"PATCH\"."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:58
-msgid ""
-"The commit log message, author name and author email are taken from the "
-"e-mail, and after minimally decoding MIME transfer encoding, re-coded in the "
-"charset specified by i18n.commitencoding (defaulting to UTF-8) by "
-"transliterating them. This used to be optional but now it is the default."
+#, priority:100
+msgid "The commit log message, author name and author email are taken from the e-mail, and after minimally decoding MIME transfer encoding, re-coded in the charset specified by i18n.commitencoding (defaulting to UTF-8) by transliterating them. This used to be optional but now it is the default."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:61
-msgid ""
-"Note that the patch is always used as-is without charset conversion, even "
-"with this flag."
+#, priority:100
+msgid "Note that the patch is always used as-is without charset conversion, even with this flag."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:65
-msgid ""
-"Similar to -u. But when re-coding, the charset specified here is used "
-"instead of the one specified by i18n.commitencoding or UTF-8."
+#, priority:100
+msgid "Similar to -u. But when re-coding, the charset specified here is used instead of the one specified by i18n.commitencoding or UTF-8."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:68
+#, priority:100
msgid "Disable all charset re-coding of the metadata."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:73
-msgid ""
-"Copy the Message-ID header at the end of the commit message. This is useful "
-"in order to associate commits with mailing list discussions."
+#, priority:100
+msgid "Copy the Message-ID header at the end of the commit message. This is useful in order to associate commits with mailing list discussions."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:82
-msgid ""
-"Remove everything in body before a scissors line. A line that mainly "
-"consists of scissors (either \">8\" or \"8<\") and perforation (dash \"-\") "
-"marks is called a scissors line, and is used to request the reader to cut "
-"the message at that line. If such a line appears in the body of the message "
-"before the patch, everything before it (including the scissors line itself) "
-"is ignored when this option is used."
+#, priority:100
+msgid "Remove everything in body before a scissors line. A line that mainly consists of scissors (either \">8\" or \"8<\") and perforation (dash \"-\") marks is called a scissors line, and is used to request the reader to cut the message at that line. If such a line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:87
-msgid ""
-"This is useful if you want to begin your message in a discussion thread with "
-"comments and suggestions on the message you are responding to, and to "
-"conclude it with a patch submission, separating the discussion and the "
-"beginning of the proposed commit log message with a scissors line."
+#, priority:100
+msgid "This is useful if you want to begin your message in a discussion thread with comments and suggestions on the message you are responding to, and to conclude it with a patch submission, separating the discussion and the beginning of the proposed commit log message with a scissors line."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:89
-msgid ""
-"This can be enabled by default with the configuration option "
-"mailinfo.scissors."
+#, priority:100
+msgid "This can be enabled by default with the configuration option mailinfo.scissors."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:92
+#, priority:100
msgid "Ignore scissors lines. Useful for overriding mailinfo.scissors settings."
msgstr ""
#. type: Labeled list
#: en/git-mailinfo.txt:93
-#, no-wrap
+#, no-wrap, priority:100
msgid "<msg>"
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:96
-msgid ""
-"The commit log message extracted from e-mail, usually except the title line "
-"which comes from e-mail Subject."
+#, priority:100
+msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject."
msgstr ""
#. type: Labeled list
#: en/git-mailinfo.txt:97
-#, no-wrap
+#, no-wrap, priority:100
msgid "<patch>"
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:99
+#, priority:100
msgid "The patch extracted from e-mail."
msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-mailsplit(1)"
msgstr "git-mailsplit(1)"
#. type: Plain text
#: en/git-mailsplit.txt:7
+#, priority:100
msgid "git-mailsplit - Simple UNIX mbox splitter program"
msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n"
"\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
@@ -36578,128 +31268,121 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:18
-msgid ""
-"Splits a mbox file or a Maildir into a list of files: \"0001\" \"0002\" .. "
-"in the specified directory so you can process them further from there."
+#, priority:100
+msgid "Splits a mbox file or a Maildir into a list of files: \"0001\" \"0002\" .. in the specified directory so you can process them further from there."
msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:21
-msgid ""
-"Maildir splitting relies upon filenames being sorted to output patches in "
-"the correct order."
+#, priority:100
+msgid "Maildir splitting relies upon filenames being sorted to output patches in the correct order."
msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:24
-#, no-wrap
+#, no-wrap, priority:100
msgid "<mbox>"
msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:27
+#, priority:100
msgid "Mbox file to split. If not given, the mbox is read from the standard input."
msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:28
-#, no-wrap
+#, no-wrap, priority:100
msgid "<Maildir>"
msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:31
-msgid ""
-"Root of the Maildir to split. This directory should contain the cur, tmp and "
-"new subdirectories."
+#, priority:100
+msgid "Root of the Maildir to split. This directory should contain the cur, tmp and new subdirectories."
msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:32
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "-o<directory>"
msgstr "--directory"
#. type: Plain text
#: en/git-mailsplit.txt:34
+#, priority:100
msgid "Directory in which to place the individual messages."
msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:38
-msgid ""
-"If any file doesn't begin with a From line, assume it is a single mail "
-"message instead of signaling error."
+#, priority:100
+msgid "If any file doesn't begin with a From line, assume it is a single mail message instead of signaling error."
msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:39
-#, no-wrap
+#, no-wrap, priority:100
msgid "-d<prec>"
msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:43
-msgid ""
-"Instead of the default 4 digits with leading zeros, different precision can "
-"be specified for the generated filenames."
+#, priority:100
+msgid "Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames."
msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "-f<nn>"
msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:47
-msgid ""
-"Skip the first <nn> numbers, for example if -f3 is specified, start the "
-"numbering with 0004."
+#, priority:100
+msgid "Skip the first <nn> numbers, for example if -f3 is specified, start the numbering with 0004."
msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-cr"
msgstr "--keep-cr"
#. type: Plain text
#: en/git-mailsplit.txt:50
+#, priority:100
msgid "Do not remove `\\r` from lines ending with `\\r\\n`."
msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--mboxrd"
msgstr "--mboxrd"
#. type: Plain text
#: en/git-mailsplit.txt:54
-msgid ""
-"Input is of the \"mboxrd\" format and \"^>+From \" line escaping is "
-"reversed."
+#, priority:100
+msgid "Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-merge-base(1)"
msgstr "git-merge-base(1)"
#. type: Plain text
#: en/git-merge-base.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-merge-base - Find as good common ancestors as possible for a merge"
msgstr "Encuentra un ancestro com첬n bueno para una posible fusi처n"
#. type: Plain text
#: en/git-merge-base.txt:17
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git merge-base' [-a|--all] <commit> <commit>...\n"
"'git merge-base' [-a|--all] --octopus <commit>...\n"
@@ -36710,129 +31393,103 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:27
-msgid ""
-"'git merge-base' finds best common ancestor(s) between two commits to use in "
-"a three-way merge. One common ancestor is 'better' than another common "
-"ancestor if the latter is an ancestor of the former. A common ancestor that "
-"does not have any better common ancestor is a 'best common ancestor', i.e. a "
-"'merge base'. Note that there can be more than one merge base for a pair of "
-"commits."
+#, priority:100
+msgid "'git merge-base' finds best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is 'better' than another common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a 'best common ancestor', i.e. a 'merge base'. Note that there can be more than one merge base for a pair of commits."
msgstr ""
#. type: Title -
#: en/git-merge-base.txt:29
-#, no-wrap
+#, no-wrap, priority:100
msgid "OPERATION MODES"
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:33
-msgid ""
-"As the most common special case, specifying only two commits on the command "
-"line means computing the merge base between the given two commits."
+#, priority:100
+msgid "As the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:38
-msgid ""
-"More generally, among the two commits to compute the merge base from, one is "
-"specified by the first commit argument on the command line; the other commit "
-"is a (possibly hypothetical) commit that is a merge across all the remaining "
-"commits on the command line."
+#, priority:100
+msgid "More generally, among the two commits to compute the merge base from, one is specified by the first commit argument on the command line; the other commit is a (possibly hypothetical) commit that is a merge across all the remaining commits on the command line."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:42
-msgid ""
-"As a consequence, the 'merge base' is not necessarily contained in each of "
-"the commit arguments if more than two commits are specified. This is "
-"different from linkgit:git-show-branch[1] when used with the `--merge-base` "
-"option."
+#, priority:100
+msgid "As a consequence, the 'merge base' is not necessarily contained in each of the commit arguments if more than two commits are specified. This is different from linkgit:git-show-branch[1] when used with the `--merge-base` option."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--octopus"
msgstr "--octopus"
#. type: Plain text
#: en/git-merge-base.txt:47
-msgid ""
-"Compute the best common ancestors of all supplied commits, in preparation "
-"for an n-way merge. This mimics the behavior of 'git show-branch "
-"--merge-base'."
+#, priority:100
+msgid "Compute the best common ancestors of all supplied commits, in preparation for an n-way merge. This mimics the behavior of 'git show-branch --merge-base'."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--independent"
msgstr "--independent"
#. type: Plain text
#: en/git-merge-base.txt:54
-msgid ""
-"Instead of printing merge bases, print a minimal subset of the supplied "
-"commits with the same ancestors. In other words, among the commits given, "
-"list those which cannot be reached from any other. This mimics the behavior "
-"of 'git show-branch --independent'."
+#, priority:100
+msgid "Instead of printing merge bases, print a minimal subset of the supplied commits with the same ancestors. In other words, among the commits given, list those which cannot be reached from any other. This mimics the behavior of 'git show-branch --independent'."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--is-ancestor"
msgstr "--is-ancestor"
#. type: Plain text
#: en/git-merge-base.txt:59
-msgid ""
-"Check if the first <commit> is an ancestor of the second <commit>, and exit "
-"with status 0 if true, or with status 1 if not. Errors are signaled by a "
-"non-zero status that is not 1."
+#, priority:100
+msgid "Check if the first <commit> is an ancestor of the second <commit>, and exit with status 0 if true, or with status 1 if not. Errors are signaled by a non-zero status that is not 1."
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
-#, no-wrap
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
#. type: Plain text
#: en/git-merge-base.txt:68
-msgid ""
-"Find the point at which a branch (or any history that leads to <commit>) "
-"forked from another branch (or any reference) <ref>. This does not just "
-"look for the common ancestor of the two commits, but also takes into account "
-"the reflog of <ref> to see if the history leading to <commit> forked from an "
-"earlier incarnation of the branch <ref> (see discussion on this mode below)."
+#, priority:100
+msgid "Find the point at which a branch (or any history that leads to <commit>) forked from another branch (or any reference) <ref>. This does not just look for the common ancestor of the two commits, but also takes into account the reflog of <ref> to see if the history leading to <commit> forked from an earlier incarnation of the branch <ref> (see discussion on this mode below)."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:74
+#, priority:100
msgid "Output all merge bases for the commits, instead of just one."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:80
-msgid ""
-"Given two commits 'A' and 'B', `git merge-base A B` will output a commit "
-"which is reachable from both 'A' and 'B' through the parent relationship."
+#, priority:100
+msgid "Given two commits 'A' and 'B', `git merge-base A B` will output a commit which is reachable from both 'A' and 'B' through the parent relationship."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:82
+#, priority:100
msgid "For example, with this topology:"
msgstr ""
#. type: delimited block .
#: en/git-merge-base.txt:87
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t o---o---o---B\n"
"\t/\n"
@@ -36841,20 +31498,19 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:90
+#, priority:100
msgid "the merge base between 'A' and 'B' is '1'."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:94
-msgid ""
-"Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute "
-"the merge base between 'A' and a hypothetical commit 'M', which is a merge "
-"between 'B' and 'C'. For example, with this topology:"
+#, priority:100
+msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
#. type: delimited block .
#: en/git-merge-base.txt:101
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---o---o---o---C\n"
" /\n"
@@ -36865,14 +31521,13 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:105
-msgid ""
-"the result of `git merge-base A B C` is '1'. This is because the equivalent "
-"topology with a merge commit 'M' between 'B' and 'C' is:"
+#, priority:100
+msgid "the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
#. type: delimited block .
#: en/git-merge-base.txt:113
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---o---o---o---o\n"
" / \\\n"
@@ -36883,29 +31538,25 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:118
-msgid ""
-"and the result of `git merge-base A M` is '1'. Commit '2' is also a common "
-"ancestor between 'A' and 'M', but '1' is a better common ancestor, because "
-"'2' is an ancestor of '1'. Hence, '2' is not a merge base."
+#, priority:100
+msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:121
-msgid ""
-"The result of `git merge-base --octopus A B C` is '2', because '2' is the "
-"best common ancestor of all commits."
+#, priority:100
+msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:124
-msgid ""
-"When the history involves criss-cross merges, there can be more than one "
-"'best' common ancestor for two commits. For example, with this topology:"
+#, priority:100
+msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
#. type: delimited block .
#: en/git-merge-base.txt:131
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"---1---o---A\n"
" \\ /\n"
@@ -36916,24 +31567,19 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:136
-msgid ""
-"both '1' and '2' are merge-bases of A and B. Neither one is better than the "
-"other (both are 'best' merge bases). When the `--all` option is not given, "
-"it is unspecified which best one is output."
+#, priority:100
+msgid "both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:141
-msgid ""
-"A common idiom to check \"fast-forward-ness\" between two commits A and B is "
-"(or at least used to be) to compute the merge base between A and B, and "
-"check if it is the same as A, in which case, A is an ancestor of B. You "
-"will see this idiom used often in older scripts."
+#, priority:100
+msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts."
msgstr ""
#. type: delimited block .
#: en/git-merge-base.txt:148
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"A=$(git rev-parse --verify A)\n"
"if test \"$A\" = \"$(git merge-base A B)\"\n"
@@ -36944,12 +31590,13 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:151
+#, priority:100
msgid "In modern git, you can say this in a more direct way:"
msgstr ""
#. type: delimited block .
#: en/git-merge-base.txt:157
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"if git merge-base --is-ancestor A B\n"
"then\n"
@@ -36959,26 +31606,25 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:160
+#, priority:100
msgid "instead."
msgstr ""
#. type: Title -
#: en/git-merge-base.txt:162
-#, no-wrap
+#, no-wrap, priority:100
msgid "Discussion on fork-point mode"
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:168
-msgid ""
-"After working on the `topic` branch created with `git switch -c topic "
-"origin/master`, the history of remote-tracking branch `origin/master` may "
-"have been rewound and rebuilt, leading to a history of this shape:"
+#, priority:100
+msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
#. type: delimited block .
#: en/git-merge-base.txt:177
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t\t o---B2\n"
"\t\t/\n"
@@ -36991,65 +31637,55 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:184
-msgid ""
-"where `origin/master` used to point at commits B0, B1, B2 and now it points "
-"at B, and your `topic` branch was started on top of it back when "
-"`origin/master` was at B0, and you built three commits, D0, D1, and D, on "
-"top of it. Imagine that you now want to rebase the work you did on the "
-"topic on top of the updated origin/master."
+#, priority:100
+msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it. Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:190
-msgid ""
-"In such a case, `git merge-base origin/master topic` would return the parent "
-"of B0 in the above picture, but B0^..D is *not* the range of commits you "
-"would want to replay on top of B (it includes B0, which is not what you "
-"wrote; it is a commit the other side discarded when it moved its tip from B0 "
-"to B1)."
+#, priority:100
+msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:198
-msgid ""
-"`git merge-base --fork-point origin/master topic` is designed to help in "
-"such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of "
-"the remote-tracking branches your repository's reflog knows about) into "
-"account to see on which commit your topic branch was built and finds B0, "
-"allowing you to replay only the commits on your topic, excluding the commits "
-"the other side later discarded."
+#, priority:100
+msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:200
+#, priority:100
msgid "Hence"
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:202
-#, no-wrap
+#, no-wrap, priority:100
msgid " $ fork_point=$(git merge-base --fork-point origin/master topic)\n"
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:204
+#, priority:100
msgid "will find B0, and"
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:206
-#, no-wrap
+#, no-wrap, priority:100
msgid " $ git rebase --onto origin/master $fork_point topic\n"
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:209
+#, priority:100
msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
msgstr ""
#. type: delimited block .
#: en/git-merge-base.txt:218
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t\t o---B2\n"
"\t\t/\n"
@@ -37062,31 +31698,19 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:226
-msgid ""
-"A caveat is that older reflog entries in your repository may be expired by "
-"`git gc`. If B0 no longer appears in the reflog of the remote-tracking "
-"branch `origin/master`, the `--fork-point` mode obviously cannot find it and "
-"fails, avoiding to give a random and useless result (such as the parent of "
-"B0, like the same command without the `--fork-point` option gives)."
+#, priority:100
+msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:237
-msgid ""
-"Also, the remote-tracking branch you use the `--fork-point` mode with must "
-"be the one your topic forked from its tip. If you forked from an older "
-"commit than the tip, this mode would not find the fork point (imagine in the "
-"above sample history B0 did not exist, origin/master started at B1, moved to "
-"B2 and then B, and you forked your topic at origin/master^ when "
-"origin/master was B1; the shape of the history would be the same as above, "
-"without B0, and the parent of B1 is what `git merge-base origin/master "
-"topic` correctly finds, but the `--fork-point` mode will not, because it is "
-"not one of the commits that used to be at the tip of origin/master)."
+#, priority:100
+msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip. If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
#: en/git-merge-base.txt:240
-#, no-wrap
+#, no-wrap, priority:100
msgid "See also"
msgstr ""
@@ -37094,24 +31718,23 @@ msgstr ""
#: en/git-merge-base.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
-msgstr ""
-"linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
+msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
#. type: Title =
#: en/git-merge-file.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-merge-file(1)"
msgstr "git-merge-file(1)"
#. type: Plain text
#: en/git-merge-file.txt:7
+#, priority:100
msgid "git-merge-file - Run a three-way file merge"
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:15
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]\n"
"\t[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]\n"
@@ -37120,27 +31743,19 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:25
-msgid ""
-"'git merge-file' incorporates all changes that lead from the `<base-file>` "
-"to `<other-file>` into `<current-file>`. The result ordinarily goes into "
-"`<current-file>`. 'git merge-file' is useful for combining separate changes "
-"to an original. Suppose `<base-file>` is the original, and both "
-"`<current-file>` and `<other-file>` are modifications of `<base-file>`, then "
-"'git merge-file' combines both changes."
+#, priority:100
+msgid "'git merge-file' incorporates all changes that lead from the `<base-file>` to `<other-file>` into `<current-file>`. The result ordinarily goes into `<current-file>`. 'git merge-file' is useful for combining separate changes to an original. Suppose `<base-file>` is the original, and both `<current-file>` and `<other-file>` are modifications of `<base-file>`, then 'git merge-file' combines both changes."
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:30
-msgid ""
-"A conflict occurs if both `<current-file>` and `<other-file>` have changes "
-"in a common segment of lines. If a conflict is found, 'git merge-file' "
-"normally outputs a warning and brackets the conflict with lines containing "
-"<<<<<<< and >>>>>>> markers. A typical conflict will look like this:"
+#, priority:100
+msgid "A conflict occurs if both `<current-file>` and `<other-file>` have changes in a common segment of lines. If a conflict is found, 'git merge-file' normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like this:"
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:36
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t<<<<<<< A\n"
"\tlines in file A\n"
@@ -37151,193 +31766,169 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:42
-msgid ""
-"If there are conflicts, the user should edit the result and delete one of "
-"the alternatives. When `--ours`, `--theirs`, or `--union` option is in "
-"effect, however, these conflicts are resolved favouring lines from "
-"`<current-file>`, lines from `<other-file>`, or lines from both "
-"respectively. The length of the conflict markers can be given with the "
-"`--marker-size` option."
+#, priority:100
+msgid "If there are conflicts, the user should edit the result and delete one of the alternatives. When `--ours`, `--theirs`, or `--union` option is in effect, however, these conflicts are resolved favouring lines from `<current-file>`, lines from `<other-file>`, or lines from both respectively. The length of the conflict markers can be given with the `--marker-size` option."
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:46
-msgid ""
-"The exit value of this program is negative on error, and the number of "
-"conflicts otherwise (truncated to 127 if there are more than that many "
-"conflicts). If the merge was clean, the exit value is 0."
+#, priority:100
+msgid "The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts). If the merge was clean, the exit value is 0."
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:50
-msgid ""
-"'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, "
-"it implements all of RCS 'merge''s functionality which is needed by "
-"linkgit:git[1]."
+#, priority:100
+msgid "'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it implements all of RCS 'merge''s functionality which is needed by linkgit:git[1]."
msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:55
-#, no-wrap
+#, no-wrap, priority:100
msgid "-L <label>"
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:62
-msgid ""
-"This option may be given up to three times, and specifies labels to be used "
-"in place of the corresponding file names in conflict reports. That is, `git "
-"merge-file -L x -L y -L z a b c` generates output that looks like it came "
-"from files x, y and z instead of from files a, b and c."
+#, priority:100
+msgid "This option may be given up to three times, and specifies labels to be used in place of the corresponding file names in conflict reports. That is, `git merge-file -L x -L y -L z a b c` generates output that looks like it came from files x, y and z instead of from files a, b and c."
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:66
+#, priority:100
msgid "Send results to standard output instead of overwriting `<current-file>`."
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:69
-#, fuzzy
+#, fuzzy, priority:100
msgid "Quiet; do not warn about conflicts."
msgstr "no advertir sobre conflictos"
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--diff3"
msgstr "--diff3"
#. type: Plain text
#: en/git-merge-file.txt:72
+#, priority:100
msgid "Show conflicts in \"diff3\" style."
msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--union"
msgstr "--union"
#. type: Plain text
#: en/git-merge-file.txt:78
-msgid ""
-"Instead of leaving conflicts in the file, resolve conflicts favouring our "
-"(or their or both) side of the lines."
+#, priority:100
+msgid "Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines."
msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:83
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git merge-file README.my README README.upstream`"
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:87
-msgid ""
-"combines the changes of README.my and README.upstream since README, tries to "
-"merge them and writes the result into README.my."
+#, priority:100
+msgid "combines the changes of README.my and README.upstream since README, tries to merge them and writes the result into README.my."
msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:88
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345`"
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:92
-msgid ""
-"merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and "
-"`c` instead of `tmp/a123` and `tmp/c345`."
+#, priority:100
+msgid "merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and `c` instead of `tmp/a123` and `tmp/c345`."
msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-merge-index(1)"
msgstr "git-merge-index(1)"
#. type: Plain text
#: en/git-merge-index.txt:7
+#, priority:100
msgid "git-merge-index - Run a merge for files needing merging"
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)\n"
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:20
-msgid ""
-"This looks up the <file>(s) in the index and, if there are any merge "
-"entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty "
-"argument if no file), and <file> as argument 4. File modes for the three "
-"files are passed as arguments 5, 6 and 7."
+#, priority:100
+msgid "This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:28
+#, priority:100
msgid "Run merge against all files in the index that need merging."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:34
-msgid ""
-"Instead of stopping at the first failed merge, do all of them in one shot - "
-"continue with merging even when previous merges returned errors, and only "
-"return the error code after all the merges."
+#, priority:100
+msgid "Instead of stopping at the first failed merge, do all of them in one shot - continue with merging even when previous merges returned errors, and only return the error code after all the merges."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:39
-msgid ""
-"Do not complain about a failed merge program (a merge program failure "
-"usually indicates conflicts during the merge). This is for porcelains which "
-"might want to emit custom messages."
+#, priority:100
+msgid "Do not complain about a failed merge program (a merge program failure usually indicates conflicts during the merge). This is for porcelains which might want to emit custom messages."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:43
-msgid ""
-"If 'git merge-index' is called with multiple <file>s (or -a) then it "
-"processes them in turn only stopping if merge returns a non-zero exit code."
+#, priority:100
+msgid "If 'git merge-index' is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:46
-msgid ""
-"Typically this is run with a script calling Git's imitation of the 'merge' "
-"command from the RCS package."
+#, priority:100
+msgid "Typically this is run with a script calling Git's imitation of the 'merge' command from the RCS package."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:49
+#, priority:100
msgid "A sample script called 'git merge-one-file' is included in the distribution."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:54
-msgid ""
-"ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS "
-"'merge' program merge object order. In the above ordering, the original is "
-"first. But the argument order to the 3-way merge program 'merge' is to have "
-"the original in the middle. Don't ask me why."
+#, priority:100
+msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:56 en/git-svn.txt:171
+#, priority:100
msgid "Examples:"
msgstr ""
#. type: delimited block -
#: en/git-merge-index.txt:63
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"torvalds@ppc970:~/merge-test> git merge-index cat MM\n"
"This is MM from the original tree.\t\t# original\n"
@@ -37348,7 +31939,7 @@ msgstr ""
#. type: delimited block -
#: en/git-merge-index.txt:74
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"torvalds@ppc970:~/merge-test> git merge-index cat AA MM\n"
"cat: : No such file or directory\n"
@@ -37360,367 +31951,301 @@ msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:80
-msgid ""
-"where the latter example shows how 'git merge-index' will stop trying to "
-"merge once anything has returned an error (i.e., `cat` returned an error for "
-"the AA file, because it didn't exist in the original, and thus 'git "
-"merge-index' didn't even try to merge the MM thing)."
+#, priority:100
+msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
#. type: Plain text
#: en/git-merge-one-file.txt:7
+#, priority:100
msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
msgstr ""
#. type: Plain text
#: en/git-merge-one-file.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'git merge-one-file'\n"
msgstr "git-merge-one-file(1)"
#. type: Plain text
#: en/git-merge-one-file.txt:18
-msgid ""
-"This is the standard helper program to use with 'git merge-index' to resolve "
-"a merge after the trivial merge done with 'git read-tree -m'."
+#, priority:100
+msgid "This is the standard helper program to use with 'git merge-index' to resolve a merge after the trivial merge done with 'git read-tree -m'."
msgstr ""
#. type: Title =
#: en/git-mergetool--lib.txt:2
-#, no-wrap
+#, no-wrap, priority:100
msgid "git-mergetool{litdd}lib(1)"
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:7
+#, priority:100
msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:19 en/git-sh-i18n.txt:19 en/git-sh-setup.txt:19
-msgid ""
-"This is not a command the end user would want to run. Ever. This "
-"documentation is meant for people who are studying the Porcelain-ish scripts "
-"and/or are writing new ones."
+#, priority:100
+msgid "This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones."
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:23
-msgid ""
-"The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using "
-"`.`) by other shell scripts to set up functions for working with Git merge "
-"tools."
+#, priority:100
+msgid "The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up functions for working with Git merge tools."
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:27
-msgid ""
-"Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` "
-"to define the operation mode for the functions listed below. 'diff' and "
-"'merge' are valid values."
+#, priority:100
+msgid "Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below. 'diff' and 'merge' are valid values."
msgstr ""
#. type: Title -
#: en/git-mergetool--lib.txt:29 en/git-sh-i18n.txt:28 en/git-sh-setup.txt:34
-#, no-wrap
+#, no-wrap, priority:100
msgid "FUNCTIONS"
msgstr ""
#. type: Labeled list
#: en/git-mergetool--lib.txt:30
-#, no-wrap
+#, no-wrap, priority:100
msgid "get_merge_tool"
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:34
-msgid ""
-"returns a merge tool. the return code is 1 if we returned a guessed merge "
-"tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to search for the "
-"appropriate guitool."
+#, priority:100
+msgid "returns a merge tool. the return code is 1 if we returned a guessed merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to search for the appropriate guitool."
msgstr ""
#. type: Labeled list
#: en/git-mergetool--lib.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid "get_merge_tool_cmd"
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:37
+#, priority:100
msgid "returns the custom command for a merge tool."
msgstr ""
#. type: Labeled list
#: en/git-mergetool--lib.txt:38
-#, no-wrap
+#, no-wrap, priority:100
msgid "get_merge_tool_path"
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:40
+#, priority:100
msgid "returns the custom path for a merge tool."
msgstr ""
#. type: Labeled list
#: en/git-mergetool--lib.txt:41
-#, no-wrap
+#, no-wrap, priority:100
msgid "run_merge_tool"
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:46
-msgid ""
-"launches a merge tool given the tool name and a true/false flag to indicate "
-"whether a merge base is present. '$MERGED', '$LOCAL', '$REMOTE', and "
-"'$BASE' must be defined for use by the merge tool."
+#, priority:100
+msgid "launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present. '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined for use by the merge tool."
msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "git-mergetool(1)"
msgstr "git-mergetool(1)"
#. type: Plain text
#: en/git-mergetool.txt:7
-#, fuzzy
-msgid ""
-"git-mergetool - Run merge conflict resolution tools to resolve merge "
-"conflicts"
-msgstr ""
-"Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver "
-"conflictos de fusi처n"
+#, fuzzy, priority:240
+msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver conflictos de fusi처n"
#. type: Plain text
#: en/git-mergetool.txt:12
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:18
-msgid ""
-"Use `git mergetool` to run one of several merge utilities to resolve merge "
-"conflicts. It is typically run after 'git merge'."
+#, priority:240
+msgid "Use `git mergetool` to run one of several merge utilities to resolve merge conflicts. It is typically run after 'git merge'."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:24
-msgid ""
-"If one or more <file> parameters are given, the merge tool program will be "
-"run to resolve differences on each file (skipping those without conflicts). "
-"Specifying a directory will include all unresolved files in that path. If "
-"no <file> names are specified, 'git mergetool' will run the merge tool "
-"program on every file with merge conflicts."
+#, priority:240
+msgid "If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:33
-msgid ""
-"Use the merge resolution program specified by <tool>. Valid values include "
-"emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run `git "
-"mergetool --tool-help` for the list of valid <tool> settings."
+#, priority:240
+msgid "Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run `git mergetool --tool-help` for the list of valid <tool> settings."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:38
-msgid ""
-"If a merge resolution program is not specified, 'git mergetool' will use the "
-"configuration variable `merge.tool`. If the configuration variable "
-"`merge.tool` is not set, 'git mergetool' will pick a suitable default."
+#, priority:240
+msgid "If a merge resolution program is not specified, 'git mergetool' will use the configuration variable `merge.tool`. If the configuration variable `merge.tool` is not set, 'git mergetool' will pick a suitable default."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:44
-msgid ""
-"You can explicitly provide a full path to the tool by setting the "
-"configuration variable `mergetool.<tool>.path`. For example, you can "
-"configure the absolute path to kdiff3 by setting "
-"`mergetool.kdiff3.path`. Otherwise, 'git mergetool' assumes the tool is "
-"available in PATH."
+#, priority:240
+msgid "You can explicitly provide a full path to the tool by setting the configuration variable `mergetool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `mergetool.kdiff3.path`. Otherwise, 'git mergetool' assumes the tool is available in PATH."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:49
-msgid ""
-"Instead of running one of the known merge tool programs, 'git mergetool' can "
-"be customized to run an alternative program by specifying the command line "
-"to invoke in a configuration variable `mergetool.<tool>.cmd`."
+#, priority:240
+msgid "Instead of running one of the known merge tool programs, 'git mergetool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `mergetool.<tool>.cmd`."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:60
-msgid ""
-"When 'git mergetool' is invoked with this tool (either through the `-t` or "
-"`--tool` option or the `merge.tool` configuration variable) the configured "
-"command line will be invoked with `$BASE` set to the name of a temporary "
-"file containing the common base for the merge, if available; `$LOCAL` set to "
-"the name of a temporary file containing the contents of the file on the "
-"current branch; `$REMOTE` set to the name of a temporary file containing the "
-"contents of the file to be merged, and `$MERGED` set to the name of the file "
-"to which the merge tool should write the result of the merge resolution."
+#, priority:240
+msgid "When 'git mergetool' is invoked with this tool (either through the `-t` or `--tool` option or the `merge.tool` configuration variable) the configured command line will be invoked with `$BASE` set to the name of a temporary file containing the common base for the merge, if available; `$LOCAL` set to the name of a temporary file containing the contents of the file on the current branch; `$REMOTE` set to the name of a temporary file containing the contents of the file to be merged, and `$MERGED` set to the name of the file to which the merge tool should write the result of the merge resolution."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:66
-msgid ""
-"If the custom merge tool correctly indicates the success of a merge "
-"resolution with its exit code, then the configuration variable "
-"`mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git "
-"mergetool' will prompt the user to indicate the success of the resolution "
-"after the custom tool has exited."
+#, priority:240
+msgid "If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable `mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:69
-#, fuzzy
+#, fuzzy, priority:240
msgid "Print a list of merge tools that may be used with `--tool`."
-msgstr ""
-"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
+msgstr "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
#. type: Plain text
#: en/git-mergetool.txt:77
-msgid ""
-"Don't prompt before each invocation of the merge resolution program. This "
-"is the default if the merge resolution program is explicitly specified with "
-"the `--tool` option or with the `merge.tool` configuration variable."
+#, priority:240
+msgid "Don't prompt before each invocation of the merge resolution program. This is the default if the merge resolution program is explicitly specified with the `--tool` option or with the `merge.tool` configuration variable."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:81
-msgid ""
-"Prompt before each invocation of the merge resolution program to give the "
-"user a chance to skip the path."
+#, priority:240
+msgid "Prompt before each invocation of the merge resolution program to give the user a chance to skip the path."
msgstr ""
#. type: Labeled list
#: en/git-mergetool.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--gui"
msgstr "--gui"
#. type: Plain text
#: en/git-mergetool.txt:89
-msgid ""
-"When 'git-mergetool' is invoked with the `-g` or `--gui` option the default "
-"merge tool will be read from the configured `merge.guitool` variable instead "
-"of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool "
-"configured under `merge.tool`."
+#, priority:240
+msgid "When 'git-mergetool' is invoked with the `-g` or `--gui` option the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool configured under `merge.tool`."
msgstr ""
#. type: Labeled list
#: en/git-mergetool.txt:90
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-gui"
msgstr "--no-gui"
#. type: Plain text
#: en/git-mergetool.txt:94
-msgid ""
-"This overrides a previous `-g` or `--gui` setting and reads the default "
-"merge tool will be read from the configured `merge.tool` variable."
+#, priority:240
+msgid "This overrides a previous `-g` or `--gui` setting and reads the default merge tool will be read from the configured `merge.tool` variable."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:101
-msgid ""
-"Process files in the order specified in the <orderfile>, which has one shell "
-"glob pattern per line. This overrides the `diff.orderFile` configuration "
-"variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use "
-"`-O/dev/null`."
+#, priority:240
+msgid "Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
#. type: Title -
#: en/git-mergetool.txt:103
-#, no-wrap
+#, no-wrap, priority:240
msgid "TEMPORARY FILES"
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:107
-msgid ""
-"`git mergetool` creates `*.orig` backup files while resolving merges. These "
-"are safe to remove once a file has been merged and its `git mergetool` "
-"session has completed."
+#, priority:240
+msgid "`git mergetool` creates `*.orig` backup files while resolving merges. These are safe to remove once a file has been merged and its `git mergetool` session has completed."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:111
-msgid ""
-"Setting the `mergetool.keepBackup` configuration variable to `false` causes "
-"`git mergetool` to automatically remove the backup as files are successfully "
-"merged."
+#, priority:240
+msgid "Setting the `mergetool.keepBackup` configuration variable to `false` causes `git mergetool` to automatically remove the backup as files are successfully merged."
msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-merge-tree(1)"
msgstr "git-merge-tree(1)"
#. type: Plain text
#: en/git-merge-tree.txt:7
+#, priority:100
msgid "git-merge-tree - Show three-way merge without touching index"
msgstr ""
#. type: Plain text
#: en/git-merge-tree.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git merge-tree' <base-tree> <branch1> <branch2>\n"
msgstr ""
#. type: Plain text
#: en/git-merge-tree.txt:21
-msgid ""
-"Reads three tree-ish, and output trivial merge results and conflicting "
-"stages to the standard output. This is similar to what three-way 'git "
-"read-tree -m' does, but instead of storing the results in the index, the "
-"command outputs the entries to the standard output."
+#, priority:100
+msgid "Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the standard output."
msgstr ""
#. type: Plain text
#: en/git-merge-tree.txt:26
-msgid ""
-"This is meant to be used by higher level scripts to compute merge results "
-"outside of the index, and stuff the results back into the index. For this "
-"reason, the output from the command omits entries that match the <branch1> "
-"tree."
+#, priority:100
+msgid "This is meant to be used by higher level scripts to compute merge results outside of the index, and stuff the results back into the index. For this reason, the output from the command omits entries that match the <branch1> tree."
msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "git-merge(1)"
msgstr "git-merge(1)"
#. type: Plain text
#: en/git-merge.txt:7
-#, fuzzy
+#, fuzzy, priority:240
msgid "git-merge - Join two or more development histories together"
msgstr "Junta dos o m찼s historiales de desarrollo juntos"
#. type: Plain text
#: en/git-merge.txt:17
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
"\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
@@ -37731,21 +32256,19 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:25
-msgid ""
-"Incorporates changes from the named commits (since the time their histories "
-"diverged from the current branch) into the current branch. This command is "
-"used by 'git pull' to incorporate changes from another repository and can be "
-"used by hand to merge changes from one branch into another."
+#, priority:240
+msgid "Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. This command is used by 'git pull' to incorporate changes from another repository and can be used by hand to merge changes from one branch into another."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:28 en/git-pull.txt:40
+#, priority:240
msgid "Assume the following history exists and the current branch is \"`master`\":"
msgstr ""
#. type: delimited block -
#: en/git-merge.txt:33
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"\t A---B---C topic\n"
"\t /\n"
@@ -37754,17 +32277,13 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:40
-msgid ""
-"Then \"`git merge topic`\" will replay the changes made on the `topic` "
-"branch since it diverged from `master` (i.e., `E`) until its current commit "
-"(`C`) on top of `master`, and record the result in a new commit along with "
-"the names of the two parent commits and a log message from the user "
-"describing the changes."
+#, priority:240
+msgid "Then \"`git merge topic`\" will replay the changes made on the `topic` branch since it diverged from `master` (i.e., `E`) until its current commit (`C`) on top of `master`, and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
msgstr ""
#. type: delimited block -
#: en/git-merge.txt:45
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"\t A---B---C topic\n"
"\t / \\\n"
@@ -37773,19 +32292,13 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:54
-msgid ""
-"The second syntax (\"`git merge --abort`\") can only be run after the merge "
-"has resulted in conflicts. 'git merge --abort' will abort the merge process "
-"and try to reconstruct the pre-merge state. However, if there were "
-"uncommitted changes when the merge started (and especially if those changes "
-"were further modified after the merge was started), 'git merge --abort' will "
-"in some cases be unable to reconstruct the original (pre-merge) "
-"changes. Therefore:"
+#, priority:240
+msgid "The second syntax (\"`git merge --abort`\") can only be run after the merge has resulted in conflicts. 'git merge --abort' will abort the merge process and try to reconstruct the pre-merge state. However, if there were uncommitted changes when the merge started (and especially if those changes were further modified after the merge was started), 'git merge --abort' will in some cases be unable to reconstruct the original (pre-merge) changes. Therefore:"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:58
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"*Warning*: Running 'git merge' with non-trivial uncommitted changes is\n"
"discouraged: while possible, it may leave you in a state that is hard to\n"
@@ -37794,269 +32307,217 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:61
-msgid ""
-"The third syntax (\"`git merge --continue`\") can only be run after the "
-"merge has resulted in conflicts."
+#, priority:240
+msgid "The third syntax (\"`git merge --continue`\") can only be run after the merge has resulted in conflicts."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:69
-msgid ""
-"Set the commit message to be used for the merge commit (in case one is "
-"created)."
+#, priority:240
+msgid "Set the commit message to be used for the merge commit (in case one is created)."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:72 en/git-merge.txt:84
-msgid ""
-"If `--log` is specified, a shortlog of the commits being merged will be "
-"appended to the specified message."
+#, priority:240
+msgid "If `--log` is specified, a shortlog of the commits being merged will be appended to the specified message."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:76
-msgid ""
-"The 'git fmt-merge-msg' command can be used to give a good default for "
-"automated 'git merge' invocations. The automated message can include the "
-"branch description."
+#, priority:240
+msgid "The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. The automated message can include the branch description."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:81
-msgid ""
-"Read the commit message to be used for the merge commit (in case one is "
-"created)."
+#, priority:240
+msgid "Read the commit message to be used for the merge commit (in case one is created)."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:94
-msgid ""
-"Silently overwrite ignored files from the merge result. This is the default "
-"behavior. Use `--no-overwrite-ignore` to abort."
+#, priority:240
+msgid "Silently overwrite ignored files from the merge result. This is the default behavior. Use `--no-overwrite-ignore` to abort."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:98
-msgid ""
-"Abort the current conflict resolution process, and try to reconstruct the "
-"pre-merge state."
+#, priority:240
+msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:103
-msgid ""
-"If there were uncommitted worktree changes present when the merge started, "
-"'git merge --abort' will in some cases be unable to reconstruct these "
-"changes. It is therefore recommended to always commit or stash your changes "
-"before running 'git merge'."
+#, priority:240
+msgid "If there were uncommitted worktree changes present when the merge started, 'git merge --abort' will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running 'git merge'."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:106
-msgid ""
-"'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` "
-"is present."
+#, priority:240
+msgid "'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` is present."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:110
-msgid ""
-"Forget about the current merge in progress. Leave the index and the working "
-"tree as-is."
+#, priority:240
+msgid "Forget about the current merge in progress. Leave the index and the working tree as-is."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:115
-msgid ""
-"After a 'git merge' stops due to conflicts you can conclude the merge by "
-"running 'git merge --continue' (see \"HOW TO RESOLVE CONFLICTS\" section "
-"below)."
+#, priority:240
+msgid "After a 'git merge' stops due to conflicts you can conclude the merge by running 'git merge --continue' (see \"HOW TO RESOLVE CONFLICTS\" section below)."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:120
-msgid ""
-"Commits, usually other branch heads, to merge into our branch. Specifying "
-"more than one commit will create a merge with more than two parents "
-"(affectionately called an Octopus merge)."
+#, priority:240
+msgid "Commits, usually other branch heads, to merge into our branch. Specifying more than one commit will create a merge with more than two parents (affectionately called an Octopus merge)."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:124
-msgid ""
-"If no commit is given from the command line, merge the remote-tracking "
-"branches that the current branch is configured to use as its upstream. See "
-"also the configuration section of this manual page."
+#, priority:240
+msgid "If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:128
-msgid ""
-"When `FETCH_HEAD` (and no other commit) is specified, the branches recorded "
-"in the `.git/FETCH_HEAD` file by the previous invocation of `git fetch` for "
-"merging are merged to the current branch."
+#, priority:240
+msgid "When `FETCH_HEAD` (and no other commit) is specified, the branches recorded in the `.git/FETCH_HEAD` file by the previous invocation of `git fetch` for merging are merged to the current branch."
msgstr ""
#. type: Title -
#: en/git-merge.txt:131
-#, no-wrap
+#, no-wrap, priority:240
msgid "PRE-MERGE CHECKS"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:139
-msgid ""
-"Before applying outside changes, you should get your own work in good shape "
-"and committed locally, so it will not be clobbered if there are conflicts. "
-"See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without "
-"doing anything when local uncommitted changes overlap with files that 'git "
-"pull'/'git merge' may need to update."
+#, priority:240
+msgid "Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there are conflicts. See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without doing anything when local uncommitted changes overlap with files that 'git pull'/'git merge' may need to update."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:145
-msgid ""
-"To avoid recording unrelated changes in the merge commit, 'git pull' and "
-"'git merge' will also abort if there are any changes registered in the index "
-"relative to the `HEAD` commit. (Special narrow exceptions to this rule may "
-"exist depending on which merge strategy is in use, but generally, the index "
-"must match HEAD.)"
+#, priority:240
+msgid "To avoid recording unrelated changes in the merge commit, 'git pull' and 'git merge' will also abort if there are any changes registered in the index relative to the `HEAD` commit. (Special narrow exceptions to this rule may exist depending on which merge strategy is in use, but generally, the index must match HEAD.)"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:148
-msgid ""
-"If all named commits are already ancestors of `HEAD`, 'git merge' will exit "
-"early with the message \"Already up to date.\""
+#, priority:240
+msgid "If all named commits are already ancestors of `HEAD`, 'git merge' will exit early with the message \"Already up to date.\""
msgstr ""
#. type: Title -
#: en/git-merge.txt:150
-#, no-wrap
+#, no-wrap, priority:240
msgid "FAST-FORWARD MERGE"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:160
-msgid ""
-"Often the current branch head is an ancestor of the named commit. This is "
-"the most common case especially when invoked from 'git pull': you are "
-"tracking an upstream repository, you have committed no local changes, and "
-"now you want to update to a newer upstream revision. In this case, a new "
-"commit is not needed to store the combined history; instead, the `HEAD` "
-"(along with the index) is updated to point at the named commit, without "
-"creating an extra merge commit."
+#, priority:240
+msgid "Often the current branch head is an ancestor of the named commit. This is the most common case especially when invoked from 'git pull': you are tracking an upstream repository, you have committed no local changes, and now you want to update to a newer upstream revision. In this case, a new commit is not needed to store the combined history; instead, the `HEAD` (along with the index) is updated to point at the named commit, without creating an extra merge commit."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:162
+#, priority:240
msgid "This behavior can be suppressed with the `--no-ff` option."
msgstr ""
#. type: Title -
#: en/git-merge.txt:164
-#, no-wrap
+#, no-wrap, priority:240
msgid "TRUE MERGE"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:169
-msgid ""
-"Except in a fast-forward merge (see above), the branches to be merged must "
-"be tied together by a merge commit that has both of them as its parents."
+#, priority:240
+msgid "Except in a fast-forward merge (see above), the branches to be merged must be tied together by a merge commit that has both of them as its parents."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:174
-msgid ""
-"A merged version reconciling the changes from all branches to be merged is "
-"committed, and your `HEAD`, index, and working tree are updated to it. It "
-"is possible to have modifications in the working tree as long as they do not "
-"overlap; the update will preserve them."
+#, priority:240
+msgid "A merged version reconciling the changes from all branches to be merged is committed, and your `HEAD`, index, and working tree are updated to it. It is possible to have modifications in the working tree as long as they do not overlap; the update will preserve them."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:177
+#, priority:240
msgid "When it is not obvious how to reconcile the changes, the following happens:"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:179
+#, priority:240
msgid "The `HEAD` pointer stays the same."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:180
+#, priority:240
msgid "The `MERGE_HEAD` ref is set to point to the other branch head."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:182
-msgid ""
-"Paths that merged cleanly are updated both in the index file and in your "
-"working tree."
+#, priority:240
+msgid "Paths that merged cleanly are updated both in the index file and in your working tree."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:188
-msgid ""
-"For conflicting paths, the index file records up to three versions: stage 1 "
-"stores the version from the common ancestor, stage 2 from `HEAD`, and stage "
-"3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). "
-"The working tree files contain the result of the \"merge\" program; "
-"i.e. 3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
+#, priority:240
+msgid "For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor, stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). The working tree files contain the result of the \"merge\" program; i.e. 3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:192
-msgid ""
-"No other changes are made. In particular, the local modifications you had "
-"before you started merge will stay the same and the index entries for them "
-"stay as they were, i.e. matching `HEAD`."
+#, priority:240
+msgid "No other changes are made. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i.e. matching `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:195
-msgid ""
-"If you tried a merge which resulted in complex conflicts and want to start "
-"over, you can recover with `git merge --abort`."
+#, priority:240
+msgid "If you tried a merge which resulted in complex conflicts and want to start over, you can recover with `git merge --abort`."
msgstr ""
#. type: Title -
#: en/git-merge.txt:197
-#, no-wrap
+#, no-wrap, priority:240
msgid "MERGING TAG"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:204
-msgid ""
-"When merging an annotated (and possibly signed) tag, Git always creates a "
-"merge commit even if a fast-forward merge is possible, and the commit "
-"message template is prepared with the tag message. Additionally, if the tag "
-"is signed, the signature check is reported as a comment in the message "
-"template. See also linkgit:git-tag[1]."
+#, priority:240
+msgid "When merging an annotated (and possibly signed) tag, Git always creates a merge commit even if a fast-forward merge is possible, and the commit message template is prepared with the tag message. Additionally, if the tag is signed, the signature check is reported as a comment in the message template. See also linkgit:git-tag[1]."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:208
-msgid ""
-"When you want to just integrate with the work leading to the commit that "
-"happens to be tagged, e.g. synchronizing with an upstream release point, you "
-"may not want to make an unnecessary merge commit."
+#, priority:240
+msgid "When you want to just integrate with the work leading to the commit that happens to be tagged, e.g. synchronizing with an upstream release point, you may not want to make an unnecessary merge commit."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:212
-msgid ""
-"In such a case, you can \"unwrap\" the tag yourself before feeding it to "
-"`git merge`, or pass `--ff-only` when you do not have any work on your "
-"own. e.g."
+#, priority:240
+msgid "In such a case, you can \"unwrap\" the tag yourself before feeding it to `git merge`, or pass `--ff-only` when you do not have any work on your own. e.g."
msgstr ""
#. type: delimited block -
#: en/git-merge.txt:217
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"git fetch origin\n"
"git merge v1.2.3^0\n"
@@ -38065,32 +32526,25 @@ msgstr ""
#. type: Title -
#: en/git-merge.txt:221
-#, no-wrap
+#, no-wrap, priority:240
msgid "HOW CONFLICTS ARE PRESENTED"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:230
-msgid ""
-"During a merge, the working tree files are updated to reflect the result of "
-"the merge. Among the changes made to the common ancestor's version, "
-"non-overlapping ones (that is, you changed an area of the file while the "
-"other side left that area intact, or vice versa) are incorporated in the "
-"final result verbatim. When both sides made changes to the same area, "
-"however, Git cannot randomly pick one side over the other, and asks you to "
-"resolve it by leaving what both sides did to that area."
+#, priority:240
+msgid "During a merge, the working tree files are updated to reflect the result of the merge. Among the changes made to the common ancestor's version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim. When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:233
-msgid ""
-"By default, Git uses the same style as the one used by the \"merge\" program "
-"from the RCS suite to present such a conflicted hunk, like this:"
+#, priority:240
+msgid "By default, Git uses the same style as the one used by the \"merge\" program from the RCS suite to present such a conflicted hunk, like this:"
msgstr ""
#. type: delimited block -
#: en/git-merge.txt:244
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"Here are lines that are either unchanged from the common\n"
"ancestor, or cleanly resolved because only one side changed.\n"
@@ -38105,33 +32559,25 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:249
-msgid ""
-"The area where a pair of conflicting changes happened is marked with markers "
-"`<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is "
-"typically your side, and the part afterwards is typically their side."
+#, priority:240
+msgid "The area where a pair of conflicting changes happened is marked with markers `<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is typically your side, and the part afterwards is typically their side."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:255
-msgid ""
-"The default format does not show what the original said in the conflicting "
-"area. You cannot tell how many lines are deleted and replaced with Barbie's "
-"remark on your side. The only thing you can tell is that your side wants to "
-"say it is hard and you'd prefer to go shopping, while the other side wants "
-"to claim it is easy."
+#, priority:240
+msgid "The default format does not show what the original said in the conflicting area. You cannot tell how many lines are deleted and replaced with Barbie's remark on your side. The only thing you can tell is that your side wants to say it is hard and you'd prefer to go shopping, while the other side wants to claim it is easy."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:259
-msgid ""
-"An alternative style can be used by setting the \"merge.conflictStyle\" "
-"configuration variable to \"diff3\". In \"diff3\" style, the above conflict "
-"may look like this:"
+#, priority:240
+msgid "An alternative style can be used by setting the \"merge.conflictStyle\" configuration variable to \"diff3\". In \"diff3\" style, the above conflict may look like this:"
msgstr ""
#. type: delimited block -
#: en/git-merge.txt:272
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"Here are lines that are either unchanged from the common\n"
"ancestor, or cleanly resolved because only one side changed.\n"
@@ -38148,204 +32594,175 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:280
-msgid ""
-"In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses "
-"another `|||||||` marker that is followed by the original text. You can "
-"tell that the original just stated a fact, and your side simply gave in to "
-"that statement and gave up, while the other side tried to have a more "
-"positive attitude. You can sometimes come up with a better resolution by "
-"viewing the original."
+#, priority:240
+msgid "In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses another `|||||||` marker that is followed by the original text. You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude. You can sometimes come up with a better resolution by viewing the original."
msgstr ""
#. type: Title -
#: en/git-merge.txt:283
-#, no-wrap
+#, no-wrap, priority:240
msgid "HOW TO RESOLVE CONFLICTS"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:286
+#, priority:240
msgid "After seeing a conflict, you can do two things:"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:291
-msgid ""
-"Decide not to merge. The only clean-ups you need are to reset the index "
-"file to the `HEAD` commit to reverse 2. and to clean up working tree changes "
-"made by 2. and 3.; `git merge --abort` can be used for this."
+#, priority:240
+msgid "Decide not to merge. The only clean-ups you need are to reset the index file to the `HEAD` commit to reverse 2. and to clean up working tree changes made by 2. and 3.; `git merge --abort` can be used for this."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:298
-msgid ""
-"Resolve the conflicts. Git will mark the conflicts in the working tree. "
-"Edit the files into shape and 'git add' them to the index. Use 'git commit' "
-"or 'git merge --continue' to seal the deal. The latter command checks "
-"whether there is a (interrupted) merge in progress before calling 'git "
-"commit'."
+#, priority:240
+msgid "Resolve the conflicts. Git will mark the conflicts in the working tree. Edit the files into shape and 'git add' them to the index. Use 'git commit' or 'git merge --continue' to seal the deal. The latter command checks whether there is a (interrupted) merge in progress before calling 'git commit'."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:300
+#, priority:240
msgid "You can work through the conflict with a number of tools:"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:303
-msgid ""
-"Use a mergetool. `git mergetool` to launch a graphical mergetool which will "
-"work you through the merge."
+#, priority:240
+msgid "Use a mergetool. `git mergetool` to launch a graphical mergetool which will work you through the merge."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:307
-msgid ""
-"Look at the diffs. `git diff` will show a three-way diff, highlighting "
-"changes from both the `HEAD` and `MERGE_HEAD` versions."
+#, priority:240
+msgid "Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` versions."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:311
-msgid ""
-"Look at the diffs from each branch. `git log --merge -p <path>` will show "
-"diffs first for the `HEAD` version and then the `MERGE_HEAD` version."
+#, priority:240
+msgid "Look at the diffs from each branch. `git log --merge -p <path>` will show diffs first for the `HEAD` version and then the `MERGE_HEAD` version."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:316
-msgid ""
-"Look at the originals. `git show :1:filename` shows the common ancestor, "
-"`git show :2:filename` shows the `HEAD` version, and `git show :3:filename` "
-"shows the `MERGE_HEAD` version."
+#, priority:240
+msgid "Look at the originals. `git show :1:filename` shows the common ancestor, `git show :2:filename` shows the `HEAD` version, and `git show :3:filename` shows the `MERGE_HEAD` version."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:323
-msgid ""
-"Merge branches `fixes` and `enhancements` on top of the current branch, "
-"making an octopus merge:"
+#, priority:240
+msgid "Merge branches `fixes` and `enhancements` on top of the current branch, making an octopus merge:"
msgstr ""
#. type: delimited block -
#: en/git-merge.txt:326
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git merge fixes enhancements\n"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:330
-msgid ""
-"Merge branch `obsolete` into the current branch, using `ours` merge "
-"strategy:"
+#, priority:240
+msgid "Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
msgstr ""
#. type: delimited block -
#: en/git-merge.txt:333
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git merge -s ours obsolete\n"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:337
-msgid ""
-"Merge branch `maint` into the current branch, but do not make a new commit "
-"automatically:"
+#, priority:240
+msgid "Merge branch `maint` into the current branch, but do not make a new commit automatically:"
msgstr ""
#. type: delimited block -
#: en/git-merge.txt:340
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git merge --no-commit maint\n"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:344
-msgid ""
-"This can be used when you want to include further changes to the merge, or "
-"want to write your own merge commit message."
+#, priority:240
+msgid "This can be used when you want to include further changes to the merge, or want to write your own merge commit message."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:348
-msgid ""
-"You should refrain from abusing this option to sneak substantial changes "
-"into a merge commit. Small fixups like bumping release/version name would "
-"be acceptable."
+#, priority:240
+msgid "You should refrain from abusing this option to sneak substantial changes into a merge commit. Small fixups like bumping release/version name would be acceptable."
msgstr ""
#. type: Labeled list
#: en/git-merge.txt:356
-#, no-wrap
+#, no-wrap, priority:240
msgid "branch.<name>.mergeOptions"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:360
-msgid ""
-"Sets default options for merging into branch <name>. The syntax and "
-"supported options are the same as those of 'git merge', but option values "
-"containing whitespace characters are currently not supported."
+#, priority:240
+msgid "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:369
#, ignore-same, priority:240
-msgid ""
-"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], "
-"linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], "
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
-msgstr ""
-"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], "
-"linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit"
-":git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
+msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
+msgstr "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
#. type: Title =
#: en/git-mktag.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-mktag(1)"
msgstr "git-mktag(1)"
#. type: Plain text
#: en/git-mktag.txt:7
+#, priority:100
msgid "git-mktag - Creates a tag object"
msgstr ""
#. type: Plain text
#: en/git-mktag.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git mktag'\n"
msgstr ""
#. type: Plain text
#: en/git-mktag.txt:18
-msgid ""
-"Reads a tag contents on standard input and creates a tag object that can "
-"also be used to sign other objects."
+#, priority:100
+msgid "Reads a tag contents on standard input and creates a tag object that can also be used to sign other objects."
msgstr ""
#. type: Plain text
#: en/git-mktag.txt:20
+#, priority:100
msgid "The output is the new tag's <object> identifier."
msgstr ""
#. type: Title -
#: en/git-mktag.txt:22
-#, no-wrap
+#, no-wrap, priority:100
msgid "Tag Format"
msgstr ""
#. type: Plain text
#: en/git-mktag.txt:25
-msgid ""
-"A tag signature file, to be fed to this command's standard input, has a very "
-"simple fixed format: four lines of"
+#, priority:100
+msgid "A tag signature file, to be fed to this command's standard input, has a very simple fixed format: four lines of"
msgstr ""
#. type: Plain text
#: en/git-mktag.txt:30
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" object <sha1>\n"
" type <typename>\n"
@@ -38355,98 +32772,85 @@ msgstr ""
#. type: Plain text
#: en/git-mktag.txt:36
-msgid ""
-"followed by some 'optional' free-form message (some tags created by older "
-"Git may not have `tagger` line). The message, when exists, is separated by "
-"a blank line from the header. The message part may contain a signature that "
-"Git itself doesn't care about, but that can be verified with gpg."
+#, priority:100
+msgid "followed by some 'optional' free-form message (some tags created by older Git may not have `tagger` line). The message, when exists, is separated by a blank line from the header. The message part may contain a signature that Git itself doesn't care about, but that can be verified with gpg."
msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-mktree(1)"
msgstr "git-mktree(1)"
#. type: Plain text
#: en/git-mktree.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-mktree - Build a tree-object from ls-tree formatted text"
msgstr "Construir un objeto 찼rbol de un texto en formato ls-tree"
#. type: Plain text
#: en/git-mktree.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'git mktree' [-z] [--missing] [--batch]\n"
msgstr "git mktree [-z] [--missing] [--batch]"
#. type: Plain text
#: en/git-mktree.txt:20
-msgid ""
-"Reads standard input in non-recursive `ls-tree` output format, and creates a "
-"tree object. The order of the tree entries is normalized by mktree so "
-"pre-sorting the input is not required. The object name of the tree object "
-"built is written to the standard output."
+#, priority:100
+msgid "Reads standard input in non-recursive `ls-tree` output format, and creates a tree object. The order of the tree entries is normalized by mktree so pre-sorting the input is not required. The object name of the tree object built is written to the standard output."
msgstr ""
#. type: Plain text
#: en/git-mktree.txt:25
+#, priority:100
msgid "Read the NUL-terminated `ls-tree -z` output instead."
msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--missing"
msgstr "--missing"
#. type: Plain text
#: en/git-mktree.txt:31
-msgid ""
-"Allow missing objects. The default behaviour (without this option) is to "
-"verify that each tree entry's sha1 identifies an existing object. This "
-"option has no effect on the treatment of gitlink entries (aka "
-"\"submodules\") which are always allowed to be missing."
+#, priority:100
+msgid "Allow missing objects. The default behaviour (without this option) is to verify that each tree entry's sha1 identifies an existing object. This option has no effect on the treatment of gitlink entries (aka \"submodules\") which are always allowed to be missing."
msgstr ""
#. type: Plain text
#: en/git-mktree.txt:37
-msgid ""
-"Allow building of more than one tree object before exiting. Each tree is "
-"separated by as single blank line. The final new-line is optional. Note - "
-"if the `-z` option is used, lines are terminated with NUL."
+#, priority:100
+msgid "Allow building of more than one tree object before exiting. Each tree is separated by as single blank line. The final new-line is optional. Note - if the `-z` option is used, lines are terminated with NUL."
msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "git-mv(1)"
msgstr "git-mv(1)"
#. type: Plain text
#: en/git-mv.txt:7
-#, fuzzy
+#, fuzzy, priority:280
msgid "git-mv - Move or rename a file, a directory, or a symlink"
msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simb처licos"
#. type: Plain text
#: en/git-mv.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git mv' <options>... <args>...\n"
msgstr ""
#. type: Plain text
#: en/git-mv.txt:17
-#, fuzzy
+#, fuzzy, priority:280
msgid "Move or rename a file, directory or symlink."
msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simb처licos"
#. type: Plain text
#: en/git-mv.txt:20
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
" git mv [-v] [-f] [-n] [-k] <source> <destination>\n"
" git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>\n"
@@ -38454,81 +32858,67 @@ msgstr ""
#. type: Plain text
#: en/git-mv.txt:25
-msgid ""
-"In the first form, it renames <source>, which must exist and be either a "
-"file, symlink or directory, to <destination>. In the second form, the last "
-"argument has to be an existing directory; the given sources will be moved "
-"into this directory."
+#, priority:280
+msgid "In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>. In the second form, the last argument has to be an existing directory; the given sources will be moved into this directory."
msgstr ""
#. type: Plain text
#: en/git-mv.txt:28
-msgid ""
-"The index is updated after successful completion, but the change must still "
-"be committed."
+#, priority:280
+msgid "The index is updated after successful completion, but the change must still be committed."
msgstr ""
#. type: Plain text
#: en/git-mv.txt:34
+#, priority:280
msgid "Force renaming or moving of a file even if the target exists"
msgstr ""
#. type: Plain text
#: en/git-mv.txt:39
-msgid ""
-"Skip move or rename actions which would lead to an error condition. An error "
-"happens when a source is neither existing nor controlled by Git, or when it "
-"would overwrite an existing file unless `-f` is given."
+#, priority:280
+msgid "Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor controlled by Git, or when it would overwrite an existing file unless `-f` is given."
msgstr ""
#. type: Plain text
#: en/git-mv.txt:42
+#, priority:280
msgid "Do nothing; only show what would happen"
msgstr ""
#. type: Plain text
#: en/git-mv.txt:46
+#, priority:280
msgid "Report the names of files as they are moved."
msgstr ""
#. type: Plain text
#: en/git-mv.txt:54
-msgid ""
-"Moving a submodule using a gitfile (which means they were cloned with a Git "
-"version 1.7.8 or newer) will update the gitfile and core.worktree setting to "
-"make the submodule work in the new location. It also will attempt to update "
-"the submodule.<name>.path setting in the linkgit:gitmodules[5] file and "
-"stage that file (unless -n is used)."
+#, priority:280
+msgid "Moving a submodule using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will update the gitfile and core.worktree setting to make the submodule work in the new location. It also will attempt to update the submodule.<name>.path setting in the linkgit:gitmodules[5] file and stage that file (unless -n is used)."
msgstr ""
#. type: Plain text
#: en/git-mv.txt:66
-msgid ""
-"Each time a superproject update moves a populated submodule (e.g. when "
-"switching between commits before and after the move) a stale submodule "
-"checkout will remain in the old location and an empty directory will appear "
-"in the new location. To populate the submodule again in the new location the "
-"user will have to run \"git submodule update\" afterwards. Removing the old "
-"directory is only safe when it uses a gitfile, as otherwise the history of "
-"the submodule will be deleted too. Both steps will be obsolete when "
-"recursive submodule update has been implemented."
+#, priority:280
+msgid "Each time a superproject update moves a populated submodule (e.g. when switching between commits before and after the move) a stale submodule checkout will remain in the old location and an empty directory will appear in the new location. To populate the submodule again in the new location the user will have to run \"git submodule update\" afterwards. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. Both steps will be obsolete when recursive submodule update has been implemented."
msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-name-rev(1)"
msgstr "git-name-rev(1)"
#. type: Plain text
#: en/git-name-rev.txt:7
+#, priority:100
msgid "git-name-rev - Find symbolic names for given revs"
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git name-rev' [--tags] [--refs=<pattern>]\n"
"\t ( --all | --stdin | <commit-ish>... )\n"
@@ -38536,95 +32926,79 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:19
-msgid ""
-"Finds symbolic names suitable for human digestion for revisions given in any "
-"format parsable by 'git rev-parse'."
+#, priority:100
+msgid "Finds symbolic names suitable for human digestion for revisions given in any format parsable by 'git rev-parse'."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:26
+#, priority:100
msgid "Do not use branch names, but only tags to name the commits"
msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:27
-#, no-wrap
+#, no-wrap, priority:100
msgid "--refs=<pattern>"
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:32
-msgid ""
-"Only use refs whose names match a given shell pattern. The pattern can be "
-"one of branch name, tag name or fully qualified ref name. If given multiple "
-"times, use refs whose names match any of the given shell patterns. Use "
-"`--no-refs` to clear any previous ref patterns given."
+#, priority:100
+msgid "Only use refs whose names match a given shell pattern. The pattern can be one of branch name, tag name or fully qualified ref name. If given multiple times, use refs whose names match any of the given shell patterns. Use `--no-refs` to clear any previous ref patterns given."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:41
-msgid ""
-"Do not use any ref whose name matches a given shell pattern. The pattern can "
-"be one of branch name, tag name or fully qualified ref name. If given "
-"multiple times, a ref will be excluded when it matches any of the given "
-"patterns. When used together with --refs, a ref will be used as a match only "
-"when it matches at least one --refs pattern and does not match any --exclude "
-"patterns. Use `--no-exclude` to clear the list of exclude patterns."
+#, priority:100
+msgid "Do not use any ref whose name matches a given shell pattern. The pattern can be one of branch name, tag name or fully qualified ref name. If given multiple times, a ref will be excluded when it matches any of the given patterns. When used together with --refs, a ref will be used as a match only when it matches at least one --refs pattern and does not match any --exclude patterns. Use `--no-exclude` to clear the list of exclude patterns."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:44
-#, fuzzy
+#, fuzzy, priority:100
msgid "List all commits reachable from all refs"
msgstr "listar todos los commits alcanzables desde todas las referencias"
#. type: Plain text
#: en/git-name-rev.txt:50
-msgid ""
-"Transform stdin by substituting all the 40-character SHA-1 hexes (say $hex) "
-"with \"$hex ($rev_name)\". When used with --name-only, substitute with "
-"\"$rev_name\", omitting $hex altogether. Intended for the scripter's use."
+#, priority:100
+msgid "Transform stdin by substituting all the 40-character SHA-1 hexes (say $hex) with \"$hex ($rev_name)\". When used with --name-only, substitute with \"$rev_name\", omitting $hex altogether. Intended for the scripter's use."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:56
-msgid ""
-"Instead of printing both the SHA-1 and the name, print only the name. If "
-"given with --tags the usual tag prefix of \"tags/\" is also omitted from the "
-"name, matching the output of `git-describe` more closely."
+#, priority:100
+msgid "Instead of printing both the SHA-1 and the name, print only the name. If given with --tags the usual tag prefix of \"tags/\" is also omitted from the name, matching the output of `git-describe` more closely."
msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-undefined"
msgstr "--no-undefined"
#. type: Plain text
#: en/git-name-rev.txt:60
-msgid ""
-"Die with error code != 0 when a reference is undefined, instead of printing "
-"`undefined`."
+#, priority:100
+msgid "Die with error code != 0 when a reference is undefined, instead of printing `undefined`."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:71
-msgid ""
-"Given a commit, find out where it is relative to the local refs. Say "
-"somebody wrote you about that fantastic commit "
-"33db5f4d9027a10e477ccf054b2c1ab94f74c85a. Of course, you look into the "
-"commit, but that only tells you what happened, but not the context."
+#, priority:100
+msgid "Given a commit, find out where it is relative to the local refs. Say somebody wrote you about that fantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a. Of course, you look into the commit, but that only tells you what happened, but not the context."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:73
+#, priority:100
msgid "Enter 'git name-rev':"
msgstr ""
#. type: delimited block -
#: en/git-name-rev.txt:77
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a\n"
"33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99~940\n"
@@ -38632,44 +33006,42 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:80
-msgid ""
-"Now you are wiser, because you know that it happened 940 revisions before "
-"v0.99."
+#, priority:100
+msgid "Now you are wiser, because you know that it happened 940 revisions before v0.99."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:82
+#, priority:100
msgid "Another nice thing you can do is:"
msgstr ""
#. type: delimited block -
#: en/git-name-rev.txt:85
-#, no-wrap
+#, no-wrap, priority:100
msgid "% git log | git name-rev --stdin\n"
msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
+#, priority:100
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git notes' [list [<object>]]\n"
-"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) "
-"<object>] [<object>]\n"
+"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
"'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n"
-"'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) "
-"<object>] [<object>]\n"
+"'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
"'git notes' edit [--allow-empty] [<object>]\n"
"'git notes' show [<object>]\n"
"'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n"
@@ -38682,486 +33054,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-msgid ""
-"Adds, removes, or reads notes attached to objects, without touching the "
-"objects themselves."
+#, priority:100
+msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-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."
+#, priority:100
+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
-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`)."
+#, priority:100
+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
-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."
+#, priority:100
+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
-msgid ""
-"To change which notes are shown by 'git log', see the \"notes.displayRef\" "
-"configuration in linkgit:git-log[1]."
+#, priority:100
+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
-msgid ""
-"See the \"notes.rewrite.<command>\" configuration for a way to carry notes "
-"across commands that rewrite commits."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-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."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-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)."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-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>`"
+#, priority:100
+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
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap
+#, no-wrap, priority:100
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-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.)"
+#, priority:100
+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
+#, fuzzy, no-wrap, priority:100
msgid "append"
msgstr "--append"
#. type: Plain text
#: en/git-notes.txt:90
-msgid ""
-"Append to the notes of an existing object (defaults to HEAD). Creates a new "
-"notes object if needed."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
+#, priority:100
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap
+#, no-wrap, priority:100
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
+#, priority:100
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
+#, fuzzy, no-wrap, priority:220
msgid "merge"
msgstr "emerge"
#. type: Plain text
#: en/git-notes.txt:102
-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\")."
+#, priority:100
+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
-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'."
+#, priority:100
+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:105
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-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."
+#, priority:100
+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:101
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
+#, priority:100
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap
+#, no-wrap, priority:100
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-msgid ""
-"Print the current notes ref. This provides an easy way to retrieve the "
-"current notes ref (e.g. from scripts)."
+#, priority:100
+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
-msgid ""
-"When adding notes to an object that already has notes, overwrite the "
-"existing notes (instead of aborting)."
+#, priority:100
+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
-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."
+#, priority:100
+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
-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."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap
+#, no-wrap, priority:100
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-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.)"
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap
+#, no-wrap, priority:100
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-msgid ""
-"Like '-C', but with `-c` the editor is invoked, so that the user can further "
-"edit the note message."
+#, priority:100
+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
-msgid ""
-"Allow an empty note object to be stored. The default behavior is to "
-"automatically remove empty notes."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-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."
+#, priority:100
+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
-msgid ""
-"Do not consider it an error to request removing notes from an object that "
-"does not have notes attached to it."
+#, priority:100
+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
-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)."
+#, priority:100
+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
-msgid ""
-"Do not remove anything; just report the object names whose notes would be "
-"removed."
+#, priority:100
+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:299 en/merge-options.txt:116
-#, no-wrap
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
+#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-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."
+#, priority:100
+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
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-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."
+#, priority:100
+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
-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."
+#, priority:100
+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
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-msgid ""
-"When merging notes, be more verbose. When pruning notes, report all object "
-"names whose notes are removed."
+#, priority:100
+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
-msgid ""
-"Commit notes are blobs containing extra information about an object (usually "
-"information to supplement a commit's message). These blobs are taken from "
-"notes refs. A notes ref is usually a branch which contains \"files\" whose "
-"paths are the object names for the objects they describe, with some "
-"directory separators included for performance reasons footnote:[Permitted "
-"pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence "
-"of directory names of two hexadecimal digits each followed by a filename "
-"with the rest of the object ID.]."
+#, ignore-ellipsis, priority:100
+msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:236
-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."
+#, priority:100
+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
-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>`."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-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'."
+#, priority:100
+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
-msgid ""
-"Users may select an automated merge strategy from among the following using "
-"either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
+#, priority:100
+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
-msgid ""
-"\"ours\" automatically resolves conflicting notes in favor of the local "
-"version (i.e. the current notes ref)."
+#, priority:100
+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
-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)."
+#, priority:100
+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
-msgid ""
-"\"union\" automatically resolves notes conflicts by concatenating the local "
-"and remote versions."
+#, priority:100
+msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-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."
+#, priority:100
+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
-msgid ""
-"You can use notes to add annotations with information that was not available "
-"at the time a commit was written."
+#, priority:100
+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
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -39171,7 +33448,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -39179,15 +33456,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-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':"
+#, priority:100
+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
+#, no-wrap, priority:100
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -39196,232 +33471,193 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-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."
+#, priority:100
+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
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-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."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-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."
+#, priority:100
+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
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap
+#, no-wrap, priority:100
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-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."
+#, priority:100
+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
-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]."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-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."
+#, priority:100
+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
-msgid ""
-"This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment "
-"variable."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-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`."
+#, priority:100
+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
-msgid ""
-"This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment "
-"variable."
+#, priority:100
+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
+#, no-wrap, priority:100
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-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."
+#, priority:100
+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
-msgid ""
-"Does not have a default value; you must configure this variable to enable "
-"note rewriting."
+#, priority:100
+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
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-msgid ""
-"Which ref to manipulate notes from, instead of `refs/notes/commits`. This "
-"overrides the `core.notesRef` setting."
+#, priority:100
+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
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-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."
+#, priority:100
+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
-msgid ""
-"A warning will be issued for refs that do not exist, but a glob that does "
-"not match any refs is silently ignored."
+#, priority:100
+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
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-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."
+#, priority:100
+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
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-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."
+#, priority:100
+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
-msgid ""
-"If not set in the environment, the list of notes to copy depends on the "
-"`notes.rewrite.<command>` and `notes.rewriteRef` settings."
+#, priority:100
+msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4(1)"
msgstr "git-p4(1)"
#. type: Plain text
#: en/git-p4.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-p4 - Import from and submit to Perforce repositories"
msgstr "Importar desde y enviar a repositorios Perforce"
#. type: Plain text
#: en/git-p4.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...\n"
"'git p4 sync' [<sync options>] [<p4 depot path>...]\n"
@@ -39431,39 +33667,37 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:22
+#, priority:100
msgid "This command provides a way to interact with p4 repositories using Git."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:30
-msgid ""
-"Create a new Git repository from an existing p4 repository using 'git p4 "
-"clone', giving it one or more p4 depot paths. Incorporate new commits from "
-"p4 changes with 'git p4 sync'. The 'sync' command is also used to include "
-"new branches from other p4 depot paths. Submit Git changes back to p4 using "
-"'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the "
-"current branch onto the updated p4 remote branch."
+#, priority:100
+msgid "Create a new Git repository from an existing p4 repository using 'git p4 clone', giving it one or more p4 depot paths. Incorporate new commits from p4 changes with 'git p4 sync'. The 'sync' command is also used to include new branches from other p4 depot paths. Submit Git changes back to p4 using 'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the current branch onto the updated p4 remote branch."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:35
+#, priority:100
msgid "Clone a repository:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:38 en/git-p4.txt:71
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git p4 clone //depot/path/project\n"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:41
+#, priority:100
msgid "Do some work in the newly created Git repository:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:46
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ cd project\n"
"$ vi foo.h\n"
@@ -39472,110 +33706,109 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:50
-msgid ""
-"Update the Git repository with recent changes from p4, rebasing your work on "
-"top:"
+#, priority:100
+msgid "Update the Git repository with recent changes from p4, rebasing your work on top:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:53 en/git-p4.txt:130
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git p4 rebase\n"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:56
+#, priority:100
msgid "Submit your commits back to p4:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:59 en/git-p4.txt:145
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git p4 submit\n"
msgstr ""
#. type: Title ~
#: en/git-p4.txt:66
-#, no-wrap
+#, no-wrap, priority:100
msgid "Clone"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:69
-msgid ""
-"Generally, 'git p4 clone' is used to create a new Git directory from an "
-"existing p4 repository:"
+#, priority:100
+msgid "Generally, 'git p4 clone' is used to create a new Git directory from an existing p4 repository:"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:73
+#, priority:100
msgid "This:"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:75
+#, priority:100
msgid "Creates an empty Git repository in a subdirectory called 'project'."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:78
-msgid ""
-"Imports the full contents of the head revision from the given p4 depot path "
-"into a single commit in the Git branch 'refs/remotes/p4/master'."
+#, priority:100
+msgid "Imports the full contents of the head revision from the given p4 depot path into a single commit in the Git branch 'refs/remotes/p4/master'."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:80
+#, priority:100
msgid "Creates a local branch, 'master' from this remote and checks it out."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:83
-msgid ""
-"To reproduce the entire p4 history in Git, use the '@all' modifier on the "
-"depot path:"
+#, priority:100
+msgid "To reproduce the entire p4 history in Git, use the '@all' modifier on the depot path:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:85
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git p4 clone //depot/path/project@all\n"
msgstr ""
#. type: Title ~
#: en/git-p4.txt:89
-#, no-wrap
+#, no-wrap, priority:100
msgid "Sync"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:92
-msgid ""
-"As development continues in the p4 repository, those changes can be included "
-"in the Git repository using:"
+#, priority:100
+msgid "As development continues in the p4 repository, those changes can be included in the Git repository using:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:94
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git p4 sync\n"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:96
+#, priority:100
msgid "This command finds new changes in p4 and imports them as Git commits."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:99
-msgid ""
-"P4 repositories can be added to an existing Git repository using 'git p4 "
-"sync' too:"
+#, priority:100
+msgid "P4 repositories can be added to an existing Git repository using 'git p4 sync' too:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:104
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ mkdir repo-git\n"
"$ cd repo-git\n"
@@ -39585,88 +33818,73 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:109
-msgid ""
-"This imports the specified depot into 'refs/remotes/p4/master' in an "
-"existing Git repository. The `--branch` option can be used to specify a "
-"different branch to be used for the p4 content."
+#, priority:100
+msgid "This imports the specified depot into 'refs/remotes/p4/master' in an existing Git repository. The `--branch` option can be used to specify a different branch to be used for the p4 content."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:114
-msgid ""
-"If a Git repository includes branches 'refs/remotes/origin/p4', these will "
-"be fetched and consulted first during a 'git p4 sync'. Since importing "
-"directly from p4 is considerably slower than pulling changes from a Git "
-"remote, this can be useful in a multi-developer environment."
+#, priority:100
+msgid "If a Git repository includes branches 'refs/remotes/origin/p4', these will be fetched and consulted first during a 'git p4 sync'. Since importing directly from p4 is considerably slower than pulling changes from a Git remote, this can be useful in a multi-developer environment."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:119
-msgid ""
-"If there are multiple branches, doing 'git p4 sync' will automatically use "
-"the \"BRANCH DETECTION\" algorithm to try to partition new changes into the "
-"right branch. This can be overridden with the `--branch` option to specify "
-"just a single branch to update."
+#, priority:100
+msgid "If there are multiple branches, doing 'git p4 sync' will automatically use the \"BRANCH DETECTION\" algorithm to try to partition new changes into the right branch. This can be overridden with the `--branch` option to specify just a single branch to update."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:122
-#, no-wrap
+#, no-wrap, priority:100
msgid "Rebase"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:128
-msgid ""
-"A common working pattern is to fetch the latest changes from the p4 depot "
-"and merge them with local uncommitted changes. Often, the p4 repository is "
-"the ultimate location for all code, thus a rebase workflow makes sense. "
-"This command does 'git p4 sync' followed by 'git rebase' to move local "
-"commits on top of updated p4 changes."
+#, priority:100
+msgid "A common working pattern is to fetch the latest changes from the p4 depot and merge them with local uncommitted changes. Often, the p4 repository is the ultimate location for all code, thus a rebase workflow makes sense. This command does 'git p4 sync' followed by 'git rebase' to move local commits on top of updated p4 changes."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:134
-#, no-wrap
+#, no-wrap, priority:100
msgid "Submit"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:140
-msgid ""
-"Submitting changes from a Git repository back to the p4 repository requires "
-"a separate p4 client workspace. This should be specified using the "
-"`P4CLIENT` environment variable or the Git configuration variable "
-"'git-p4.client'. The p4 client must exist, but the client root will be "
-"created and populated if it does not already exist."
+#, priority:100
+msgid "Submitting changes from a Git repository back to the p4 repository requires a separate p4 client workspace. This should be specified using the `P4CLIENT` environment variable or the Git configuration variable 'git-p4.client'. The p4 client must exist, but the client root will be created and populated if it does not already exist."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:143
-msgid ""
-"To submit all changes that are in the current Git branch but not in the "
-"'p4/master' branch, use:"
+#, priority:100
+msgid "To submit all changes that are in the current Git branch but not in the 'p4/master' branch, use:"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:148
+#, priority:100
msgid "To specify a branch other than the current one, use:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:150
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git p4 submit topicbranch\n"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:153
+#, priority:100
msgid "To specify a single commit or a range of commits, use:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:156
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git p4 submit --commit <sha1>\n"
"$ git p4 submit --commit <sha1..sha1>\n"
@@ -39674,30 +33892,25 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:160
-msgid ""
-"The upstream reference is generally 'refs/remotes/p4/master', but can be "
-"overridden using the `--origin=` command-line option."
+#, priority:100
+msgid "The upstream reference is generally 'refs/remotes/p4/master', but can be overridden using the `--origin=` command-line option."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:165
-msgid ""
-"The p4 changes will be created as the user invoking 'git p4 submit'. The "
-"`--preserve-user` option will cause ownership to be modified according to "
-"the author of the Git commit. This option requires admin privileges in p4, "
-"which can be granted using 'p4 protect'."
+#, priority:100
+msgid "The p4 changes will be created as the user invoking 'git p4 submit'. The `--preserve-user` option will cause ownership to be modified according to the author of the Git commit. This option requires admin privileges in p4, which can be granted using 'p4 protect'."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:167
-msgid ""
-"To shelve changes instead of submitting, use `--shelve` and "
-"`--update-shelve`:"
+#, priority:100
+msgid "To shelve changes instead of submitting, use `--shelve` and `--update-shelve`:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:171
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git p4 submit --shelve\n"
"$ git p4 submit --update-shelve 1234 --update-shelve 2345\n"
@@ -39705,40 +33918,37 @@ msgstr ""
#. type: Title ~
#: en/git-p4.txt:175
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "Unshelve"
msgstr "--shelve"
#. type: Plain text
#: en/git-p4.txt:178
-msgid ""
-"Unshelving will take a shelved P4 changelist, and produce the equivalent git "
-"commit in the branch refs/remotes/p4-unshelved/<changelist>."
+#, priority:100
+msgid "Unshelving will take a shelved P4 changelist, and produce the equivalent git commit in the branch refs/remotes/p4-unshelved/<changelist>."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:182
-msgid ""
-"The git commit is created relative to the current origin revision (HEAD by "
-"default). A parent commit is created based on the origin, and then the "
-"unshelve commit is created based on that."
+#, priority:100
+msgid "The git commit is created relative to the current origin revision (HEAD by default). A parent commit is created based on the origin, and then the unshelve commit is created based on that."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:184
+#, priority:100
msgid "The origin revision can be changed with the \"--origin\" option."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:187
-msgid ""
-"If the target branch in refs/remotes/p4-unshelved already exists, the old "
-"one will be renamed."
+#, priority:100
+msgid "If the target branch in refs/remotes/p4-unshelved already exists, the old one will be renamed."
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:195
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git p4 sync\n"
"$ git p4 unshelve 12345\n"
@@ -39750,81 +33960,79 @@ msgstr ""
#. type: Title ~
#: en/git-p4.txt:202
-#, no-wrap
+#, no-wrap, priority:100
msgid "General options"
msgstr "Opciones generales"
#. type: Plain text
#: en/git-p4.txt:204
+#, priority:100
msgid "All commands except clone accept these options."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:205
-#, no-wrap
+#, no-wrap, priority:100
msgid "--git-dir <dir>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:207
+#, priority:100
msgid "Set the `GIT_DIR` environment variable. See linkgit:git[1]."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:211
+#, priority:100
msgid "Provide more progress information."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:213
-#, no-wrap
+#, no-wrap, priority:100
msgid "Sync options"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:216
-msgid ""
-"These options can be used in the initial 'clone' as well as in subsequent "
-"'sync' operations."
+#, priority:100
+msgid "These options can be used in the initial 'clone' as well as in subsequent 'sync' operations."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:217
-#, no-wrap
+#, no-wrap, priority:100
msgid "--branch <ref>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:221
-msgid ""
-"Import changes into <ref> instead of refs/remotes/p4/master. If <ref> "
-"starts with refs/, it is used as is. Otherwise, if it does not start with "
-"p4/, that prefix is added."
+#, priority:100
+msgid "Import changes into <ref> instead of refs/remotes/p4/master. If <ref> starts with refs/, it is used as is. Otherwise, if it does not start with p4/, that prefix is added."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:225
-msgid ""
-"By default a <ref> not starting with refs/ is treated as the name of a "
-"remote-tracking branch (under refs/remotes/). This behavior can be modified "
-"using the --import-local option."
+#, priority:100
+msgid "By default a <ref> not starting with refs/ is treated as the name of a remote-tracking branch (under refs/remotes/). This behavior can be modified using the --import-local option."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:227
+#, priority:100
msgid "The default <ref> is \"master\"."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:230
-msgid ""
-"This example imports a new remote \"p4/proj2\" into an existing Git "
-"repository:"
+#, priority:100
+msgid "This example imports a new remote \"p4/proj2\" into an existing Git repository:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:234
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" $ git init\n"
" $ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2\n"
@@ -39832,583 +34040,499 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:236
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--detect-branches"
msgstr "--detect-branches"
#. type: Plain text
#: en/git-p4.txt:239
-msgid ""
-"Use the branch detection algorithm to find new paths in p4. It is "
-"documented below in \"BRANCH DETECTION\"."
+#, priority:100
+msgid "Use the branch detection algorithm to find new paths in p4. It is documented below in \"BRANCH DETECTION\"."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:240
-#, no-wrap
+#, no-wrap, priority:100
msgid "--changesfile <file>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:244
-msgid ""
-"Import exactly the p4 change numbers listed in 'file', one per line. "
-"Normally, 'git p4' inspects the current p4 repository state and detects the "
-"changes it should import."
+#, priority:100
+msgid "Import exactly the p4 change numbers listed in 'file', one per line. Normally, 'git p4' inspects the current p4 repository state and detects the changes it should import."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:245
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--silent"
msgstr "--silent"
#. type: Plain text
#: en/git-p4.txt:247
+#, priority:100
msgid "Do not print any progress information."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:248
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--detect-labels"
msgstr "--detect-labels"
#. type: Plain text
#: en/git-p4.txt:252
-msgid ""
-"Query p4 for labels associated with the depot paths, and add them as tags in "
-"Git. Limited usefulness as only imports labels associated with new "
-"changelists. Deprecated."
+#, priority:100
+msgid "Query p4 for labels associated with the depot paths, and add them as tags in Git. Limited usefulness as only imports labels associated with new changelists. Deprecated."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:253 en/git-p4.txt:389
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--import-labels"
msgstr "--import-labels"
#. type: Plain text
#: en/git-p4.txt:255
+#, priority:100
msgid "Import labels from p4 into Git."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:256
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--import-local"
msgstr "--import-local"
#. type: Plain text
#: en/git-p4.txt:263
-msgid ""
-"By default, p4 branches are stored in 'refs/remotes/p4/', where they will be "
-"treated as remote-tracking branches by linkgit:git-branch[1] and other "
-"commands. This option instead puts p4 branches in 'refs/heads/p4/'. Note "
-"that future sync operations must specify `--import-local` as well so that "
-"they can find the p4 branches in refs/heads."
+#, priority:100
+msgid "By default, p4 branches are stored in 'refs/remotes/p4/', where they will be treated as remote-tracking branches by linkgit:git-branch[1] and other commands. This option instead puts p4 branches in 'refs/heads/p4/'. Note that future sync operations must specify `--import-local` as well so that they can find the p4 branches in refs/heads."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:264
-#, no-wrap
+#, no-wrap, priority:100
msgid "--max-changes <n>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:270
-msgid ""
-"Import at most 'n' changes, rather than the entire range of changes included "
-"in the given revision specifier. A typical usage would be use '@all' as the "
-"revision specifier, but then to use '--max-changes 1000' to import only the "
-"last 1000 revisions rather than the entire revision history."
+#, priority:100
+msgid "Import at most 'n' changes, rather than the entire range of changes included in the given revision specifier. A typical usage would be use '@all' as the revision specifier, but then to use '--max-changes 1000' to import only the last 1000 revisions rather than the entire revision history."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:271
-#, no-wrap
+#, no-wrap, priority:100
msgid "--changes-block-size <n>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:279
-msgid ""
-"The internal block size to use when converting a revision specifier such as "
-"'@all' into a list of specific change numbers. Instead of using a single "
-"call to 'p4 changes' to find the full list of changes for the conversion, "
-"there are a sequence of calls to 'p4 changes -m', each of which requests one "
-"block of changes of the given size. The default block size is 500, which "
-"should usually be suitable."
+#, priority:100
+msgid "The internal block size to use when converting a revision specifier such as '@all' into a list of specific change numbers. Instead of using a single call to 'p4 changes' to find the full list of changes for the conversion, there are a sequence of calls to 'p4 changes -m', each of which requests one block of changes of the given size. The default block size is 500, which should usually be suitable."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:280
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-path"
msgstr "--keep-path"
#. type: Plain text
#: en/git-p4.txt:287
-msgid ""
-"The mapping of file names from the p4 depot path to Git, by default, "
-"involves removing the entire depot path. With this option, the full p4 "
-"depot path is retained in Git. For example, path '//depot/main/foo/bar.c', "
-"when imported from '//depot/main/', becomes 'foo/bar.c'. With "
-"`--keep-path`, the Git path is instead 'depot/main/foo/bar.c'."
+#, priority:100
+msgid "The mapping of file names from the p4 depot path to Git, by default, involves removing the entire depot path. With this option, the full p4 depot path is retained in Git. For example, path '//depot/main/foo/bar.c', when imported from '//depot/main/', becomes 'foo/bar.c'. With `--keep-path`, the Git path is instead 'depot/main/foo/bar.c'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:288
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--use-client-spec"
msgstr "--use-client-spec"
#. type: Plain text
#: en/git-p4.txt:291
-msgid ""
-"Use a client spec to find the list of interesting files in p4. See the "
-"\"CLIENT SPEC\" section below."
+#, priority:100
+msgid "Use a client spec to find the list of interesting files in p4. See the \"CLIENT SPEC\" section below."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:292
-#, no-wrap
+#, no-wrap, priority:100
msgid "-/ <path>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:294
+#, priority:100
msgid "Exclude selected depot paths when cloning or syncing."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:296
-#, no-wrap
+#, no-wrap, priority:100
msgid "Clone options"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:299
-msgid ""
-"These options can be used in an initial 'clone', along with the 'sync' "
-"options described above."
+#, priority:100
+msgid "These options can be used in an initial 'clone', along with the 'sync' options described above."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:300
-#, no-wrap
+#, no-wrap, priority:100
msgid "--destination <directory>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:304
-msgid ""
-"Where to create the Git repository. If not provided, the last component in "
-"the p4 depot path is used to create a new directory."
+#, priority:100
+msgid "Where to create the Git repository. If not provided, the last component in the p4 depot path is used to create a new directory."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:307
+#, priority:100
msgid "Perform a bare clone. See linkgit:git-clone[1]."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:309
-#, no-wrap
+#, no-wrap, priority:100
msgid "Submit options"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:311
+#, priority:100
msgid "These options can be used to modify 'git p4 submit' behavior."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:312
-#, no-wrap
+#, no-wrap, priority:100
msgid "--origin <commit>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:316
-msgid ""
-"Upstream location from which commits are identified to submit to p4. By "
-"default, this is the most recent p4 commit reachable from `HEAD`."
+#, priority:100
+msgid "Upstream location from which commits are identified to submit to p4. By default, this is the most recent p4 commit reachable from `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:322
-msgid ""
-"Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4 "
-"using explicit 'move' operations. There is no corresponding option to "
-"detect copies, but there are variables for both moves and copies."
+#, priority:100
+msgid "Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4 using explicit 'move' operations. There is no corresponding option to detect copies, but there are variables for both moves and copies."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:323
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--preserve-user"
msgstr "--preserve-user"
#. type: Plain text
#: en/git-p4.txt:326
-msgid ""
-"Re-author p4 changes before submitting to p4. This option requires p4 admin "
-"privileges."
+#, priority:100
+msgid "Re-author p4 changes before submitting to p4. This option requires p4 admin privileges."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:327
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--export-labels"
msgstr "--export-labels"
#. type: Plain text
#: en/git-p4.txt:330
-msgid ""
-"Export tags from Git as p4 labels. Tags found in Git are applied to the "
-"perforce working directory."
+#, priority:100
+msgid "Export tags from Git as p4 labels. Tags found in Git are applied to the perforce working directory."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:335
-msgid ""
-"Show just what commits would be submitted to p4; do not change state in Git "
-"or p4."
+#, priority:100
+msgid "Show just what commits would be submitted to p4; do not change state in Git or p4."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:336
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--prepare-p4-only"
msgstr "--prepare-p4-only"
#. type: Plain text
#: en/git-p4.txt:342
-msgid ""
-"Apply a commit to the p4 workspace, opening, adding and deleting files in p4 "
-"as for a normal submit operation. Do not issue the final \"p4 submit\", but "
-"instead print a message about how to submit manually or revert. This option "
-"always stops after the first (oldest) commit. Git tags are not exported to "
-"p4."
+#, priority:100
+msgid "Apply a commit to the p4 workspace, opening, adding and deleting files in p4 as for a normal submit operation. Do not issue the final \"p4 submit\", but instead print a message about how to submit manually or revert. This option always stops after the first (oldest) commit. Git tags are not exported to p4."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:343
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--shelve"
msgstr "--shelve"
#. type: Plain text
#: en/git-p4.txt:347
-msgid ""
-"Instead of submitting create a series of shelved changelists. After "
-"creating each shelve, the relevant files are reverted/deleted. If you have "
-"multiple commits pending multiple shelves will be created."
+#, priority:100
+msgid "Instead of submitting create a series of shelved changelists. After creating each shelve, the relevant files are reverted/deleted. If you have multiple commits pending multiple shelves will be created."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:348
-#, no-wrap
+#, no-wrap, priority:100
msgid "--update-shelve CHANGELIST"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:351
-msgid ""
-"Update an existing shelved changelist with this commit. Implies "
-"--shelve. Repeat for multiple shelved changelists."
+#, priority:100
+msgid "Update an existing shelved changelist with this commit. Implies --shelve. Repeat for multiple shelved changelists."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:352
-#, no-wrap
+#, no-wrap, priority:100
msgid "--conflict=(ask|skip|quit)"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:358
-msgid ""
-"Conflicts can occur when applying a commit to p4. When this happens, the "
-"default behavior (\"ask\") is to prompt whether to skip this commit and "
-"continue, or quit. This option can be used to bypass the prompt, causing "
-"conflicting commits to be automatically skipped, or to quit trying to apply "
-"commits, without prompting."
+#, priority:100
+msgid "Conflicts can occur when applying a commit to p4. When this happens, the default behavior (\"ask\") is to prompt whether to skip this commit and continue, or quit. This option can be used to bypass the prompt, causing conflicting commits to be automatically skipped, or to quit trying to apply commits, without prompting."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:359 en/git-submodule.txt:281
-#, no-wrap
+#, no-wrap, priority:220
msgid "--branch <branch>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:363
-msgid ""
-"After submitting, sync this named branch instead of the default p4/master. "
-"See the \"Sync options\" section above for more information."
+#, priority:100
+msgid "After submitting, sync this named branch instead of the default p4/master. See the \"Sync options\" section above for more information."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:364
-#, no-wrap
+#, no-wrap, priority:100
msgid "--commit <sha1>|<sha1..sha1>"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:367
-msgid ""
-"Submit only the specified commit or range of commits, instead of the full "
-"list of changes that are in the current Git branch."
+#, priority:100
+msgid "Submit only the specified commit or range of commits, instead of the full list of changes that are in the current Git branch."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:368
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--disable-rebase"
msgstr "--disable-rebase"
#. type: Plain text
#: en/git-p4.txt:371
-msgid ""
-"Disable the automatic rebase after all commits have been successfully "
-"submitted. Can also be set with git-p4.disableRebase."
+#, priority:100
+msgid "Disable the automatic rebase after all commits have been successfully submitted. Can also be set with git-p4.disableRebase."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:372
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--disable-p4sync"
msgstr "--disable-p4sync"
#. type: Plain text
#: en/git-p4.txt:376
-msgid ""
-"Disable the automatic sync of p4/master from Perforce after commits have "
-"been submitted. Implies --disable-rebase. Can also be set with "
-"git-p4.disableP4Sync. Sync with origin/master still goes ahead if possible."
+#, priority:100
+msgid "Disable the automatic sync of p4/master from Perforce after commits have been submitted. Implies --disable-rebase. Can also be set with git-p4.disableP4Sync. Sync with origin/master still goes ahead if possible."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:378
-#, no-wrap
+#, no-wrap, priority:100
msgid "Hook for submit"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:382
-msgid ""
-"The `p4-pre-submit` hook is executed if it exists and is executable. The "
-"hook takes no parameters and nothing from standard input. Exiting with "
-"non-zero status from this script prevents `git-p4 submit` from launching."
+#, priority:100
+msgid "The `p4-pre-submit` hook is executed if it exists and is executable. The hook takes no parameters and nothing from standard input. Exiting with non-zero status from this script prevents `git-p4 submit` from launching."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:384
+#, priority:100
msgid "One usage scenario is to run unit tests in the hook."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:386
-#, no-wrap
+#, no-wrap, priority:100
msgid "Rebase options"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:388
+#, priority:100
msgid "These options can be used to modify 'git p4 rebase' behavior."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:391
+#, priority:100
msgid "Import p4 labels."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:393
-#, no-wrap
+#, no-wrap, priority:100
msgid "Unshelve options"
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:395
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--origin"
msgstr "--origin"
#. type: Plain text
#: en/git-p4.txt:398
-msgid ""
-"Sets the git refspec against which the shelved P4 changelist is compared. "
-"Defaults to p4/master."
+#, priority:100
+msgid "Sets the git refspec against which the shelved P4 changelist is compared. Defaults to p4/master."
msgstr ""
#. type: Title -
#: en/git-p4.txt:400
-#, no-wrap
+#, no-wrap, priority:100
msgid "DEPOT PATH SYNTAX"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:404
-msgid ""
-"The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or "
-"more space-separated p4 depot paths, with an optional p4 revision specifier "
-"on the end:"
+#, priority:100
+msgid "The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or more space-separated p4 depot paths, with an optional p4 revision specifier on the end:"
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:405
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"//depot/my/project\""
msgstr ""
#. type: Plain text
#: en/git-p4.txt:407
+#, priority:100
msgid "Import one commit with all files in the '#head' change under that tree."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:408
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"//depot/my/project@all\""
msgstr ""
#. type: Plain text
#: en/git-p4.txt:410
+#, priority:100
msgid "Import one commit for each change in the history of that depot path."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:411
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"//depot/my/project@1,6\""
msgstr ""
#. type: Plain text
#: en/git-p4.txt:413
+#, priority:100
msgid "Import only changes 1 through 6."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:414
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"//depot/proj1@all //depot/proj2@all\""
msgstr ""
#. type: Plain text
#: en/git-p4.txt:423
-msgid ""
-"Import all changes from both named depot paths into a single repository. "
-"Only files below these directories are included. There is not a "
-"subdirectory in Git for each \"proj1\" and \"proj2\". You must use the "
-"`--destination` option when specifying more than one depot path. The "
-"revision specifier must be specified identically on each depot path. If "
-"there are files in the depot paths with the same name, the path with the "
-"most recently updated version of the file is the one that appears in Git."
+#, priority:100
+msgid "Import all changes from both named depot paths into a single repository. Only files below these directories are included. There is not a subdirectory in Git for each \"proj1\" and \"proj2\". You must use the `--destination` option when specifying more than one depot path. The revision specifier must be specified identically on each depot path. If there are files in the depot paths with the same name, the path with the most recently updated version of the file is the one that appears in Git."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:425
+#, priority:100
msgid "See 'p4 help revisions' for the full syntax of p4 revision specifiers."
msgstr ""
#. type: Title -
#: en/git-p4.txt:428
-#, no-wrap
+#, no-wrap, priority:100
msgid "CLIENT SPEC"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:438
-msgid ""
-"The p4 client specification is maintained with the 'p4 client' command and "
-"contains among other fields, a View that specifies how the depot is mapped "
-"into the client repository. The 'clone' and 'sync' commands can consult the "
-"client spec when given the `--use-client-spec` option or when the "
-"useClientSpec variable is true. After 'git p4 clone', the useClientSpec "
-"variable is automatically set in the repository configuration file. This "
-"allows future 'git p4 submit' commands to work properly; the submit command "
-"looks only at the variable and does not have a command-line option."
+#, priority:100
+msgid "The p4 client specification is maintained with the 'p4 client' command and contains among other fields, a View that specifies how the depot is mapped into the client repository. The 'clone' and 'sync' commands can consult the client spec when given the `--use-client-spec` option or when the useClientSpec variable is true. After 'git p4 clone', the useClientSpec variable is automatically set in the repository configuration file. This allows future 'git p4 submit' commands to work properly; the submit command looks only at the variable and does not have a command-line option."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:445
-msgid ""
-"The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' "
-"knows only a subset of the view syntax. It understands multi-line mappings, "
-"overlays with '+', exclusions with '-' and double-quotes around whitespace. "
-"Of the possible wildcards, 'git p4' only handles '...', and only when it is "
-"at the end of the path. 'git p4' will complain if it encounters an "
-"unhandled wildcard."
+#, ignore-ellipsis, priority:100
+msgid "The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' knows only a subset of the view syntax. It understands multi-line mappings, overlays with '+', exclusions with '-' and double-quotes around whitespace. Of the possible wildcards, 'git p4' only handles '...', and only when it is at the end of the path. 'git p4' will complain if it encounters an unhandled wildcard."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:450
-msgid ""
-"Bugs in the implementation of overlap mappings exist. If multiple depot "
-"paths map through overlays to the same location in the repository, 'git p4' "
-"can choose the wrong one. This is hard to solve without dedicating a client "
-"spec just for 'git p4'."
+#, priority:100
+msgid "Bugs in the implementation of overlap mappings exist. If multiple depot paths map through overlays to the same location in the repository, 'git p4' can choose the wrong one. This is hard to solve without dedicating a client spec just for 'git p4'."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:455
-msgid ""
-"The name of the client can be given to 'git p4' in multiple ways. The "
-"variable 'git-p4.client' takes precedence if it exists. Otherwise, normal "
-"p4 mechanisms of determining the client are used: environment variable "
-"`P4CLIENT`, a file referenced by `P4CONFIG`, or the local host name."
+#, priority:100
+msgid "The name of the client can be given to 'git p4' in multiple ways. The variable 'git-p4.client' takes precedence if it exists. Otherwise, normal p4 mechanisms of determining the client are used: environment variable `P4CLIENT`, a file referenced by `P4CONFIG`, or the local host name."
msgstr ""
#. type: Title -
#: en/git-p4.txt:458
-#, no-wrap
+#, no-wrap, priority:100
msgid "BRANCH DETECTION"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:465
-msgid ""
-"P4 does not have the same concept of a branch as Git. Instead, p4 organizes "
-"its content as a directory tree, where by convention different logical "
-"branches are in different locations in the tree. The 'p4 branch' command is "
-"used to maintain mappings between different areas in the tree, and indicate "
-"related content. 'git p4' can use these mappings to determine branch "
-"relationships."
+#, priority:100
+msgid "P4 does not have the same concept of a branch as Git. Instead, p4 organizes its content as a directory tree, where by convention different logical branches are in different locations in the tree. The 'p4 branch' command is used to maintain mappings between different areas in the tree, and indicate related content. 'git p4' can use these mappings to determine branch relationships."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:470
-msgid ""
-"If you have a repository where all the branches of interest exist as "
-"subdirectories of a single depot path, you can use `--detect-branches` when "
-"cloning or syncing to have 'git p4' automatically find subdirectories in p4, "
-"and to generate these as branches in Git."
+#, priority:100
+msgid "If you have a repository where all the branches of interest exist as subdirectories of a single depot path, you can use `--detect-branches` when cloning or syncing to have 'git p4' automatically find subdirectories in p4, and to generate these as branches in Git."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:472
+#, priority:100
msgid "For example, if the P4 repository structure is:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:475
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"//depot/main/...\n"
"//depot/branch1/...\n"
@@ -40416,49 +34540,43 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:478
+#, priority:100
msgid "And \"p4 branch -o branch1\" shows a View line that looks like:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:480
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "//depot/main/... //depot/branch1/...\n"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:483
+#, priority:100
msgid "Then this 'git p4 clone' command:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:485
-#, no-wrap
+#, no-wrap, priority:100
msgid "git p4 clone --detect-branches //depot@all\n"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:488
-msgid ""
-"produces a separate branch in 'refs/remotes/p4/' for //depot/main, called "
-"'master', and one for //depot/branch1 called 'depot/branch1'."
+#, priority:100
+msgid "produces a separate branch in 'refs/remotes/p4/' for //depot/main, called 'master', and one for //depot/branch1 called 'depot/branch1'."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:498
-msgid ""
-"However, it is not necessary to create branches in p4 to be able to use them "
-"like branches. Because it is difficult to infer branch relationships "
-"automatically, a Git configuration setting 'git-p4.branchList' can be used "
-"to explicitly identify branch relationships. It is a list of "
-"\"source:destination\" pairs, like a simple p4 branch specification, where "
-"the \"source\" and \"destination\" are the path elements in the p4 "
-"repository. The example above relied on the presence of the p4 branch. "
-"Without p4 branches, the same result will occur with:"
+#, priority:100
+msgid "However, it is not necessary to create branches in p4 to be able to use them like branches. Because it is difficult to infer branch relationships automatically, a Git configuration setting 'git-p4.branchList' can be used to explicitly identify branch relationships. It is a list of \"source:destination\" pairs, like a simple p4 branch specification, where the \"source\" and \"destination\" are the path elements in the p4 repository. The example above relied on the presence of the p4 branch. Without p4 branches, the same result will occur with:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:503
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git init depot\n"
"cd depot\n"
@@ -40468,167 +34586,139 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:512
-msgid ""
-"The fast-import mechanism used by 'git p4' creates one pack file for each "
-"invocation of 'git p4 sync'. Normally, Git garbage compression "
-"(linkgit:git-gc[1]) automatically compresses these to fewer pack files, but "
-"explicit invocation of 'git repack -adf' may improve performance."
+#, priority:100
+msgid "The fast-import mechanism used by 'git p4' creates one pack file for each invocation of 'git p4 sync'. Normally, Git garbage compression (linkgit:git-gc[1]) automatically compresses these to fewer pack files, but explicit invocation of 'git repack -adf' may improve performance."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:518
-msgid ""
-"The following config settings can be used to modify 'git p4' behavior. They "
-"all are in the 'git-p4' section."
+#, priority:100
+msgid "The following config settings can be used to modify 'git p4' behavior. They all are in the 'git-p4' section."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:520
-#, no-wrap
+#, no-wrap, priority:100
msgid "General variables"
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:521
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.user"
msgstr "git-p4.user"
#. type: Plain text
#: en/git-p4.txt:524
-msgid ""
-"User specified as an option to all p4 commands, with '-u <user>'. The "
-"environment variable `P4USER` can be used instead."
+#, priority:100
+msgid "User specified as an option to all p4 commands, with '-u <user>'. The environment variable `P4USER` can be used instead."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:525
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.password"
msgstr "git-p4.password"
#. type: Plain text
#: en/git-p4.txt:529
-msgid ""
-"Password specified as an option to all p4 commands, with '-P <password>'. "
-"The environment variable `P4PASS` can be used instead."
+#, priority:100
+msgid "Password specified as an option to all p4 commands, with '-P <password>'. The environment variable `P4PASS` can be used instead."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:530
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.port"
msgstr "git-p4.port"
#. type: Plain text
#: en/git-p4.txt:534
-msgid ""
-"Port specified as an option to all p4 commands, with '-p <port>'. The "
-"environment variable `P4PORT` can be used instead."
+#, priority:100
+msgid "Port specified as an option to all p4 commands, with '-p <port>'. The environment variable `P4PORT` can be used instead."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:535
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.host"
msgstr "git-p4.host"
#. type: Plain text
#: en/git-p4.txt:539
-msgid ""
-"Host specified as an option to all p4 commands, with '-h <host>'. The "
-"environment variable `P4HOST` can be used instead."
+#, priority:100
+msgid "Host specified as an option to all p4 commands, with '-h <host>'. The environment variable `P4HOST` can be used instead."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:540
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.client"
msgstr "git-p4.client"
#. type: Plain text
#: en/git-p4.txt:543
-msgid ""
-"Client specified as an option to all p4 commands, with '-c <client>', "
-"including the client spec."
+#, priority:100
+msgid "Client specified as an option to all p4 commands, with '-c <client>', including the client spec."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:544
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.retries"
msgstr "git-p4.retries"
#. type: Plain text
#: en/git-p4.txt:549
-msgid ""
-"Specifies the number of times to retry a p4 command (notably, 'p4 sync') if "
-"the network times out. The default value is 3. Set the value to 0 to "
-"disable retries or if your p4 version does not support retries (pre 2012.2)."
+#, priority:100
+msgid "Specifies the number of times to retry a p4 command (notably, 'p4 sync') if the network times out. The default value is 3. Set the value to 0 to disable retries or if your p4 version does not support retries (pre 2012.2)."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:551
-#, no-wrap
+#, no-wrap, priority:100
msgid "Clone and sync variables"
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:552
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.syncFromOrigin"
msgstr "git-p4.syncFromOrigin"
#. type: Plain text
#: en/git-p4.txt:558
-msgid ""
-"Because importing commits from other Git repositories is much faster than "
-"importing them from p4, a mechanism exists to find p4 changes first in Git "
-"remotes. If branches exist under 'refs/remote/origin/p4', those will be "
-"fetched and used when syncing from p4. This variable can be set to 'false' "
-"to disable this behavior."
+#, priority:100
+msgid "Because importing commits from other Git repositories is much faster than importing them from p4, a mechanism exists to find p4 changes first in Git remotes. If branches exist under 'refs/remote/origin/p4', those will be fetched and used when syncing from p4. This variable can be set to 'false' to disable this behavior."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:559
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.branchUser"
msgstr "git-p4.branchUser"
#. type: Plain text
#: en/git-p4.txt:564
-msgid ""
-"One phase in branch detection involves looking at p4 branches to find new "
-"ones to import. By default, all branches are inspected. This option limits "
-"the search to just those owned by the single user named in the variable."
+#, priority:100
+msgid "One phase in branch detection involves looking at p4 branches to find new ones to import. By default, all branches are inspected. This option limits the search to just those owned by the single user named in the variable."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:565
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.branchList"
msgstr "git-p4.branchList"
#. type: Plain text
#: en/git-p4.txt:570
-msgid ""
-"List of branches to be imported when branch detection is enabled. Each "
-"entry should be a pair of branch names separated by a colon (:). This "
-"example declares that both branchA and branchB were created from main:"
+#, priority:100
+msgid "List of branches to be imported when branch detection is enabled. Each entry should be a pair of branch names separated by a colon (:). This example declares that both branchA and branchB were created from main:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:574
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git config git-p4.branchList main:branchA\n"
"git config --add git-p4.branchList main:branchB\n"
@@ -40636,464 +34726,399 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:576
-#, no-wrap
+#, no-wrap, priority:100
msgid "git-p4.ignoredP4Labels"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:579
-msgid ""
-"List of p4 labels to ignore. This is built automatically as unimportable "
-"labels are discovered."
+#, priority:100
+msgid "List of p4 labels to ignore. This is built automatically as unimportable labels are discovered."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:580
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.importLabels"
msgstr "git-p4.importLabels"
#. type: Plain text
#: en/git-p4.txt:582
+#, priority:100
msgid "Import p4 labels into git, as per --import-labels."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:583
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.labelImportRegexp"
msgstr "git-p4.labelImportRegexp"
#. type: Plain text
#: en/git-p4.txt:586
-msgid ""
-"Only p4 labels matching this regular expression will be imported. The "
-"default value is '[a-zA-Z0-9_\\-.]+$'."
+#, priority:100
+msgid "Only p4 labels matching this regular expression will be imported. The default value is '[a-zA-Z0-9_\\-.]+$'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:587
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.useClientSpec"
msgstr "git-p4.useClientSpec"
#. type: Plain text
#: en/git-p4.txt:592
-msgid ""
-"Specify that the p4 client spec should be used to identify p4 depot paths of "
-"interest. This is equivalent to specifying the option `--use-client-spec`. "
-"See the \"CLIENT SPEC\" section above. This variable is a boolean, not the "
-"name of a p4 client."
+#, priority:100
+msgid "Specify that the p4 client spec should be used to identify p4 depot paths of interest. This is equivalent to specifying the option `--use-client-spec`. See the \"CLIENT SPEC\" section above. This variable is a boolean, not the name of a p4 client."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:593
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.pathEncoding"
msgstr "git-p4.pathEncoding"
#. type: Plain text
#: en/git-p4.txt:599
-msgid ""
-"Perforce keeps the encoding of a path as given by the originating OS. Git "
-"expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding "
-"Perforce had used for the paths. This encoding is used to transcode the "
-"paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to "
-"encode path names."
+#, priority:100
+msgid "Perforce keeps the encoding of a path as given by the originating OS. Git expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding Perforce had used for the paths. This encoding is used to transcode the paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to encode path names."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:600
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileSystem"
msgstr "git-p4.largeFileSystem"
#. type: Plain text
#: en/git-p4.txt:606
-msgid ""
-"Specify the system that is used for large (binary) files. Please note that "
-"large file systems do not support the 'git p4 submit' command. Only Git LFS "
-"is implemented right now (see https://git-lfs.github.com/ for more "
-"information). Download and install the Git LFS command line extension to use "
-"this option and configure it like this:"
+#, priority:100
+msgid "Specify the system that is used for large (binary) files. Please note that large file systems do not support the 'git p4 submit' command. Only Git LFS is implemented right now (see https://git-lfs.github.com/ for more information). Download and install the Git LFS command line extension to use this option and configure it like this:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:609
-#, no-wrap
+#, no-wrap, priority:100
msgid "git config git-p4.largeFileSystem GitLFS\n"
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:611
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileExtensions"
msgstr "git-p4.largeFileExtensions"
#. type: Plain text
#: en/git-p4.txt:614
-msgid ""
-"All files matching a file extension in the list will be processed by the "
-"large file system. Do not prefix the extensions with '.'."
+#, priority:100
+msgid "All files matching a file extension in the list will be processed by the large file system. Do not prefix the extensions with '.'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:615
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileThreshold"
msgstr "git-p4.largeFileThreshold"
#. type: Plain text
#: en/git-p4.txt:619
-msgid ""
-"All files with an uncompressed size exceeding the threshold will be "
-"processed by the large file system. By default the threshold is defined in "
-"bytes. Add the suffix k, m, or g to change the unit."
+#, priority:100
+msgid "All files with an uncompressed size exceeding the threshold will be processed by the large file system. By default the threshold is defined in bytes. Add the suffix k, m, or g to change the unit."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:620
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFileCompressedThreshold"
msgstr "git-p4.largeFileCompressedThreshold"
#. type: Plain text
#: en/git-p4.txt:625
-msgid ""
-"All files with a compressed size exceeding the threshold will be processed "
-"by the large file system. This option might slow down your clone/sync "
-"process. By default the threshold is defined in bytes. Add the suffix k, m, "
-"or g to change the unit."
+#, priority:100
+msgid "All files with a compressed size exceeding the threshold will be processed by the large file system. This option might slow down your clone/sync process. By default the threshold is defined in bytes. Add the suffix k, m, or g to change the unit."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:626
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.largeFilePush"
msgstr "git-p4.largeFilePush"
#. type: Plain text
#: en/git-p4.txt:629
-msgid ""
-"Boolean variable which defines if large files are automatically pushed to a "
-"server."
+#, priority:100
+msgid "Boolean variable which defines if large files are automatically pushed to a server."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:630
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.keepEmptyCommits"
msgstr "git-p4.keepEmptyCommits"
#. type: Plain text
#: en/git-p4.txt:633
-msgid ""
-"A changelist that contains only excluded files will be imported as an empty "
-"commit if this boolean option is set to true."
+#, priority:100
+msgid "A changelist that contains only excluded files will be imported as an empty commit if this boolean option is set to true."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:634
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.mapUser"
msgstr "git-p4.mapUser"
#. type: Plain text
#: en/git-p4.txt:637
-msgid ""
-"Map a P4 user to a name and email address in Git. Use a string with the "
-"following format to create a mapping:"
+#, priority:100
+msgid "Map a P4 user to a name and email address in Git. Use a string with the following format to create a mapping:"
msgstr ""
#. type: delimited block -
#: en/git-p4.txt:640
-#, no-wrap
+#, no-wrap, priority:100
msgid "git config --add git-p4.mapUser \"p4user = First Last <mail@address.com>\"\n"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:644
-msgid ""
-"A mapping will override any user information from P4. Mappings for multiple "
-"P4 user can be defined."
+#, priority:100
+msgid "A mapping will override any user information from P4. Mappings for multiple P4 user can be defined."
msgstr ""
#. type: Title ~
#: en/git-p4.txt:646
-#, no-wrap
+#, no-wrap, priority:100
msgid "Submit variables"
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:647
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectRenames"
msgstr "git-p4.detectRenames"
#. type: Plain text
#: en/git-p4.txt:650
-msgid ""
-"Detect renames. See linkgit:git-diff[1]. This can be true, false, or a "
-"score as expected by 'git diff -M'."
+#, priority:100
+msgid "Detect renames. See linkgit:git-diff[1]. This can be true, false, or a score as expected by 'git diff -M'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:651
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectCopies"
msgstr "git-p4.detectCopies"
#. type: Plain text
#: en/git-p4.txt:654
-msgid ""
-"Detect copies. See linkgit:git-diff[1]. This can be true, false, or a "
-"score as expected by 'git diff -C'."
+#, priority:100
+msgid "Detect copies. See linkgit:git-diff[1]. This can be true, false, or a score as expected by 'git diff -C'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:655
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.detectCopiesHarder"
msgstr "git-p4.detectCopiesHarder"
#. type: Plain text
#: en/git-p4.txt:657
+#, priority:100
msgid "Detect copies harder. See linkgit:git-diff[1]. A boolean."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:658
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.preserveUser"
msgstr "git-p4.preserveUser"
#. type: Plain text
#: en/git-p4.txt:661
-msgid ""
-"On submit, re-author changes to reflect the Git author, regardless of who "
-"invokes 'git p4 submit'."
+#, priority:100
+msgid "On submit, re-author changes to reflect the Git author, regardless of who invokes 'git p4 submit'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:662
-#, no-wrap
+#, no-wrap, priority:100
msgid "git-p4.allowMissingP4Users"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:666
-msgid ""
-"When 'preserveUser' is true, 'git p4' normally dies if it cannot find an "
-"author in the p4 user map. This setting submits the change regardless."
+#, priority:100
+msgid "When 'preserveUser' is true, 'git p4' normally dies if it cannot find an author in the p4 user map. This setting submits the change regardless."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:667
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipSubmitEdit"
msgstr "git-p4.skipSubmitEdit"
#. type: Plain text
#: en/git-p4.txt:671
-msgid ""
-"The submit process invokes the editor before each p4 change is submitted. "
-"If this setting is true, though, the editing step is skipped."
+#, priority:100
+msgid "The submit process invokes the editor before each p4 change is submitted. If this setting is true, though, the editing step is skipped."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:672
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipSubmitEditCheck"
msgstr "git-p4.skipSubmitEditCheck"
#. type: Plain text
#: en/git-p4.txt:676
-msgid ""
-"After editing the p4 change message, 'git p4' makes sure that the "
-"description really was changed by looking at the file modification time. "
-"This option disables that test."
+#, priority:100
+msgid "After editing the p4 change message, 'git p4' makes sure that the description really was changed by looking at the file modification time. This option disables that test."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:677
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.allowSubmit"
msgstr "git-p4.allowSubmit"
#. type: Plain text
#: en/git-p4.txt:683
-msgid ""
-"By default, any branch can be used as the source for a 'git p4 submit' "
-"operation. This configuration variable, if set, permits only the named "
-"branches to be used as submit sources. Branch names must be the short names "
-"(no \"refs/heads/\"), and should be separated by commas (\",\"), with no "
-"spaces."
+#, priority:100
+msgid "By default, any branch can be used as the source for a 'git p4 submit' operation. This configuration variable, if set, permits only the named branches to be used as submit sources. Branch names must be the short names (no \"refs/heads/\"), and should be separated by commas (\",\"), with no spaces."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:684
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.skipUserNameCheck"
msgstr "git-p4.skipUserNameCheck"
#. type: Plain text
#: en/git-p4.txt:688
-msgid ""
-"If the user running 'git p4 submit' does not exist in the p4 user map, 'git "
-"p4' exits. This option can be used to force submission regardless."
+#, priority:100
+msgid "If the user running 'git p4 submit' does not exist in the p4 user map, 'git p4' exits. This option can be used to force submission regardless."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:689
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.attemptRCSCleanup"
msgstr "git-p4.attemptRCSCleanup"
#. type: Plain text
#: en/git-p4.txt:694
-msgid ""
-"If enabled, 'git p4 submit' will attempt to cleanup RCS keywords ($Header$, "
-"etc). These would otherwise cause merge conflicts and prevent the submit "
-"going ahead. This option should be considered experimental at present."
+#, priority:100
+msgid "If enabled, 'git p4 submit' will attempt to cleanup RCS keywords ($Header$, etc). These would otherwise cause merge conflicts and prevent the submit going ahead. This option should be considered experimental at present."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:695
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.exportLabels"
msgstr "git-p4.exportLabels"
#. type: Plain text
#: en/git-p4.txt:697
+#, priority:100
msgid "Export Git tags to p4 labels, as per --export-labels."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:698
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.labelExportRegexp"
msgstr "git-p4.labelExportRegexp"
#. type: Plain text
#: en/git-p4.txt:701
-msgid ""
-"Only p4 labels matching this regular expression will be exported. The "
-"default value is '[a-zA-Z0-9_\\-.]+$'."
+#, priority:100
+msgid "Only p4 labels matching this regular expression will be exported. The default value is '[a-zA-Z0-9_\\-.]+$'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:702
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.conflict"
msgstr "git-p4.conflict"
#. type: Plain text
#: en/git-p4.txt:705
-msgid ""
-"Specify submit behavior when a conflict with p4 is found, as per "
-"--conflict. The default behavior is 'ask'."
+#, priority:100
+msgid "Specify submit behavior when a conflict with p4 is found, as per --conflict. The default behavior is 'ask'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:706
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-p4.disableRebase"
msgstr "git-p4.disableRebase"
#. type: Plain text
#: en/git-p4.txt:708
+#, priority:100
msgid "Do not rebase the tree against p4/master following a submit."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:709
-#, no-wrap
+#, no-wrap, priority:100
msgid "git-p4.disableP4Sync"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:711
-msgid ""
-"Do not sync p4/master with Perforce following a submit. Implies "
-"git-p4.disableRebase."
+#, priority:100
+msgid "Do not sync p4/master with Perforce following a submit. Implies git-p4.disableRebase."
msgstr ""
#. type: Title -
#: en/git-p4.txt:713
-#, no-wrap
+#, no-wrap, priority:100
msgid "IMPLEMENTATION DETAILS"
msgstr ""
#. type: Plain text
#: en/git-p4.txt:715
+#, priority:100
msgid "Changesets from p4 are imported using Git fast-import."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:717
-msgid ""
-"Cloning or syncing does not require a p4 client; file contents are collected "
-"using 'p4 print'."
+#, priority:100
+msgid "Cloning or syncing does not require a p4 client; file contents are collected using 'p4 print'."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:720
-msgid ""
-"Submitting requires a p4 client, which is not in the same location as the "
-"Git repository. Patches are applied, one at a time, to this p4 client and "
-"submitted from there."
+#, priority:100
+msgid "Submitting requires a p4 client, which is not in the same location as the Git repository. Patches are applied, one at a time, to this p4 client and submitted from there."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:723
-msgid ""
-"Each commit imported by 'git p4' has a line at the end of the log message "
-"indicating the p4 depot location and change number. This line is used by "
-"later 'git p4 sync' operations to know which p4 changes are new."
+#, priority:100
+msgid "Each commit imported by 'git p4' has a line at the end of the log message indicating the p4 depot location and change number. This line is used by later 'git p4 sync' operations to know which p4 changes are new."
msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-pack-objects(1)"
msgstr "git-pack-objects(1)"
#. type: Plain text
#: en/git-pack-objects.txt:7
+#, priority:100
msgid "git-pack-objects - Create a packed archive of objects"
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:18
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
-"'git pack-objects' [-q | --progress | --all-progress] "
-"[--all-progress-implied]\n"
+"'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]\n"
"\t[--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
"\t[--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
"\t[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
@@ -41103,591 +35128,439 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:25
-msgid ""
-"Reads list of objects from the standard input, and writes either one or more "
-"packed archives with the specified base-name to disk, or a packed archive to "
-"the standard output."
+#, priority:100
+msgid "Reads list of objects from the standard input, and writes either one or more packed archives with the specified base-name to disk, or a packed archive to the standard output."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:31
-msgid ""
-"A packed archive is an efficient way to transfer a set of objects between "
-"two repositories as well as an access efficient archival format. In a "
-"packed archive, an object is either stored as a compressed whole or as a "
-"difference from some other object. The latter is often called a delta."
+#, priority:100
+msgid "A packed archive is an efficient way to transfer a set of objects between two repositories as well as an access efficient archival format. In a packed archive, an object is either stored as a compressed whole or as a difference from some other object. The latter is often called a delta."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:35
-msgid ""
-"The packed archive format (.pack) is designed to be self-contained so that "
-"it can be unpacked without any further information. Therefore, each object "
-"that a delta depends upon must be present within the pack."
+#, priority:100
+msgid "The packed archive format (.pack) is designed to be self-contained so that it can be unpacked without any further information. Therefore, each object that a delta depends upon must be present within the pack."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:41
-msgid ""
-"A pack index file (.idx) is generated for fast, random access to the objects "
-"in the pack. Placing both the index file (.idx) and the packed archive "
-"(.pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the "
-"directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) enables Git to read from "
-"the pack archive."
+#, priority:100
+msgid "A pack index file (.idx) is generated for fast, random access to the objects in the pack. Placing both the index file (.idx) and the packed archive (.pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) enables Git to read from the pack archive."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:47
-msgid ""
-"The 'git unpack-objects' command can read the packed archive and expand the "
-"objects contained in the pack into \"one-file one-object\" format; this is "
-"typically done by the smart-pull commands when a pack is created on-the-fly "
-"for efficient network transport by their peers."
+#, priority:100
+msgid "The 'git unpack-objects' command can read the packed archive and expand the objects contained in the pack into \"one-file one-object\" format; this is typically done by the smart-pull commands when a pack is created on-the-fly for efficient network transport by their peers."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:51
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "base-name"
msgstr "nombre base"
#. type: Plain text
#: en/git-pack-objects.txt:58
-msgid ""
-"Write into pairs of files (.pack and .idx), using <base-name> to determine "
-"the name of the created file. When this option is used, the two files in a "
-"pair are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash "
-"based on the pack content and is written to the standard output of the "
-"command."
+#, priority:100
+msgid "Write into pairs of files (.pack and .idx), using <base-name> to determine the name of the created file. When this option is used, the two files in a pair are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash based on the pack content and is written to the standard output of the command."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:62
-msgid ""
-"Write the pack contents (what would have been written to .pack file) out to "
-"the standard output."
+#, priority:100
+msgid "Write the pack contents (what would have been written to .pack file) out to the standard output."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:63
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--revs"
msgstr "--revs"
#. type: Plain text
#: en/git-pack-objects.txt:71
-msgid ""
-"Read the revision arguments from the standard input, instead of individual "
-"object names. The revision arguments are processed the same way as 'git "
-"rev-list' with the `--objects` flag uses its `commit` arguments to build the "
-"list of objects it outputs. The objects on the resulting list are packed. "
-"Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
+#, priority:100
+msgid "Read the revision arguments from the standard input, instead of individual object names. The revision arguments are processed the same way as 'git rev-list' with the `--objects` flag uses its `commit` arguments to build the list of objects it outputs. The objects on the resulting list are packed. Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:72 en/rev-list-options.txt:721
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
#. type: Plain text
#: en/git-pack-objects.txt:76
-msgid ""
-"This implies `--revs`. When processing the list of revision arguments read "
-"from the standard input, limit the objects packed to those that are not "
-"already packed."
+#, priority:100
+msgid "This implies `--revs`. When processing the list of revision arguments read from the standard input, limit the objects packed to those that are not already packed."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:82
-msgid ""
-"This implies `--revs`. In addition to the list of revision arguments read "
-"from the standard input, pretend as if all refs under `refs/` are specified "
-"to be included."
+#, priority:100
+msgid "This implies `--revs`. In addition to the list of revision arguments read from the standard input, pretend as if all refs under `refs/` are specified to be included."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:87
-msgid ""
-"Include unasked-for annotated tags if the object they reference was included "
-"in the resulting packfile. This can be useful to send new tags to native "
-"Git clients."
+#, priority:100
+msgid "Include unasked-for annotated tags if the object they reference was included in the resulting packfile. This can be useful to send new tags to native Git clients."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:88 en/git-repack.txt:89
-#, no-wrap
+#, no-wrap, priority:100
msgid "--window=<n>"
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:99
-msgid ""
-"These two options affect how the objects contained in the pack are stored "
-"using delta compression. The objects are first internally sorted by type, "
-"size and optionally names and compared against the other objects within "
-"--window to see if using delta compression saves space. --depth limits the "
-"maximum delta depth; making it too deep affects the performance on the "
-"unpacker side, because delta data needs to be applied that many times to get "
-"to the necessary object."
+#, priority:100
+msgid "These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the other objects within --window to see if using delta compression saves space. --depth limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:102 en/git-repack.txt:101
-msgid ""
-"The default value for --window is 10 and --depth is 50. The maximum depth is "
-"4095."
+#, priority:100
+msgid "The default value for --window is 10 and --depth is 50. The maximum depth is 4095."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:103 en/git-repack.txt:105
-#, no-wrap
+#, no-wrap, priority:100
msgid "--window-memory=<n>"
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:113
-msgid ""
-"This option provides an additional limit on top of `--window`; the window "
-"size will dynamically scale down so as to not take up more than '<n>' bytes "
-"in memory. This is useful in repositories with a mix of large and small "
-"objects to not run out of memory with a large window, but still be able to "
-"take advantage of the large window for the smaller objects. The size can be "
-"suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
-"usage unlimited. The default is taken from the `pack.windowMemory` "
-"configuration variable."
+#, priority:100
+msgid "This option provides an additional limit on top of `--window`; the window size will dynamically scale down so as to not take up more than '<n>' bytes in memory. This is useful in repositories with a mix of large and small objects to not run out of memory with a large window, but still be able to take advantage of the large window for the smaller objects. The size can be suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory usage unlimited. The default is taken from the `pack.windowMemory` configuration variable."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:125
-msgid ""
-"In unusual scenarios, you may not be able to create files larger than a "
-"certain size on your filesystem, and this option can be used to tell the "
-"command to split the output packfile into multiple independent packfiles, "
-"each not larger than the given size. The size can be suffixed with \"k\", "
-"\"m\", or \"g\". The minimum size allowed is limited to 1 MiB. This option "
-"prevents the creation of a bitmap index. The default is unlimited, unless "
-"the config variable `pack.packSizeLimit` is set."
+#, priority:100
+msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB. This option prevents the creation of a bitmap index. The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:126
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--honor-pack-keep"
msgstr "--honor-pack-keep"
#. type: Plain text
#: en/git-pack-objects.txt:130
-msgid ""
-"This flag causes an object already in a local pack that has a .keep file to "
-"be ignored, even if it would have otherwise been packed."
+#, priority:100
+msgid "This flag causes an object already in a local pack that has a .keep file to be ignored, even if it would have otherwise been packed."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:131 en/git-repack.txt:143
-#, no-wrap
+#, no-wrap, priority:100
msgid "--keep-pack=<pack-name>"
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:137
-msgid ""
-"This flag causes an object already in the given pack to be ignored, even if "
-"it would have otherwise been packed. `<pack-name>` is the pack file name "
-"without leading directory (e.g. `pack-123.pack`). The option could be "
-"specified multiple times to keep multiple packs."
+#, priority:100
+msgid "This flag causes an object already in the given pack to be ignored, even if it would have otherwise been packed. `<pack-name>` is the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple packs."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:141
-msgid ""
-"This flag causes an object already in a pack to be ignored even if it would "
-"have otherwise been packed."
+#, priority:100
+msgid "This flag causes an object already in a pack to be ignored even if it would have otherwise been packed."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:146
-msgid ""
-"This flag causes an object that is borrowed from an alternate object store "
-"to be ignored even if it would have otherwise been packed."
+#, priority:100
+msgid "This flag causes an object that is borrowed from an alternate object store to be ignored even if it would have otherwise been packed."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:147
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--non-empty"
msgstr "--non-empty"
#. type: Plain text
#: en/git-pack-objects.txt:150
+#, priority:100
msgid "Only create a packed archive if it would contain at least one object."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:177
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-reuse-delta"
msgstr "--no-reuse-delta"
#. type: Plain text
#: en/git-pack-objects.txt:183
-msgid ""
-"When creating a packed archive in a repository that has existing packs, the "
-"command reuses existing deltas. This sometimes results in a slightly "
-"suboptimal pack. This flag tells the command not to reuse existing deltas "
-"but compute them from scratch."
+#, priority:100
+msgid "When creating a packed archive in a repository that has existing packs, the command reuses existing deltas. This sometimes results in a slightly suboptimal pack. This flag tells the command not to reuse existing deltas but compute them from scratch."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:184
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-reuse-object"
msgstr "--no-reuse-object"
#. type: Plain text
#: en/git-pack-objects.txt:190
-msgid ""
-"This flag tells the command not to reuse existing object data at all, "
-"including non deltified object, forcing recompression of everything. This "
-"implies --no-reuse-delta. Useful only in the obscure case where wholesale "
-"enforcement of a different compression level on the packed data is desired."
+#, priority:100
+msgid "This flag tells the command not to reuse existing object data at all, including non deltified object, forcing recompression of everything. This implies --no-reuse-delta. Useful only in the obscure case where wholesale enforcement of a different compression level on the packed data is desired."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:191
-#, no-wrap
+#, no-wrap, priority:100
msgid "--compression=<n>"
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:198
-msgid ""
-"Specifies compression level for newly-compressed data in the generated "
-"pack. If not specified, pack compression level is determined first by "
-"pack.compression, then by core.compression, and defaults to -1, the zlib "
-"default, if neither is set. Add --no-reuse-object if you want to force a "
-"uniform compression level on all data no matter the source."
+#, priority:100
+msgid "Specifies compression level for newly-compressed data in the generated pack. If not specified, pack compression level is determined first by pack.compression, then by core.compression, and defaults to -1, the zlib default, if neither is set. Add --no-reuse-object if you want to force a uniform compression level on all data no matter the source."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:207
-msgid ""
-"Use the \"sparse\" algorithm to determine which objects to include in the "
-"pack, when combined with the \"--revs\" option. This algorithm only walks "
-"trees that appear in paths that introduce new objects. This can have "
-"significant performance benefits when computing a pack to send a small "
-"change. However, it is possible that extra objects are added to the "
-"pack-file if the included commits contain certain types of direct renames."
+#, priority:100
+msgid "Use the \"sparse\" algorithm to determine which objects to include in the pack, when combined with the \"--revs\" option. This algorithm only walks trees that appear in paths that introduce new objects. This can have significant performance benefits when computing a pack to send a small change. However, it is possible that extra objects are added to the pack-file if the included commits contain certain types of direct renames."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:212
-msgid ""
-"Create a \"thin\" pack by omitting the common objects between a sender and a "
-"receiver in order to reduce network transfer. This option only makes sense "
-"in conjunction with --stdout."
+#, priority:100
+msgid "Create a \"thin\" pack by omitting the common objects between a sender and a receiver in order to reduce network transfer. This option only makes sense in conjunction with --stdout."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:217
-msgid ""
-"Note: A thin pack violates the packed archive format by omitting required "
-"objects and is thus unusable by Git without making it self-contained. Use "
-"`git index-pack --fix-thin` (see linkgit:git-index-pack[1]) to restore the "
-"self-contained property."
+#, priority:100
+msgid "Note: A thin pack violates the packed archive format by omitting required objects and is thus unusable by Git without making it self-contained. Use `git index-pack --fix-thin` (see linkgit:git-index-pack[1]) to restore the self-contained property."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:218
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--shallow"
msgstr "--shallow"
#. type: Plain text
#: en/git-pack-objects.txt:222
-msgid ""
-"Optimize a pack that will be provided to a client with a shallow "
-"repository. This option, combined with --thin, can result in a smaller pack "
-"at the cost of speed."
+#, priority:100
+msgid "Optimize a pack that will be provided to a client with a shallow repository. This option, combined with --thin, can result in a smaller pack at the cost of speed."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:223
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--delta-base-offset"
msgstr "--delta-base-offset"
#. type: Plain text
#: en/git-pack-objects.txt:233
-msgid ""
-"A packed archive can express the base object of a delta as either a 20-byte "
-"object name or as an offset in the stream, but ancient versions of Git don't "
-"understand the latter. By default, 'git pack-objects' only uses the former "
-"format for better compatibility. This option allows the command to use the "
-"latter format for compactness. Depending on the average delta chain length, "
-"this option typically shrinks the resulting packfile by 3-5 per-cent."
+#, priority:100
+msgid "A packed archive can express the base object of a delta as either a 20-byte object name or as an offset in the stream, but ancient versions of Git don't understand the latter. By default, 'git pack-objects' only uses the former format for better compatibility. This option allows the command to use the latter format for compactness. Depending on the average delta chain length, this option typically shrinks the resulting packfile by 3-5 per-cent."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:238
-msgid ""
-"Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]), `git "
-"repack` (see linkgit:git-repack[1]) pass this option by default in modern "
-"Git when they put objects in your repository into pack files. So does `git "
-"bundle` (see linkgit:git-bundle[1]) when it creates a bundle."
+#, priority:100
+msgid "Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]), `git repack` (see linkgit:git-repack[1]) pass this option by default in modern Git when they put objects in your repository into pack files. So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:248
-msgid ""
-"Specifies the number of threads to spawn when searching for best delta "
-"matches. This requires that pack-objects be compiled with pthreads "
-"otherwise this option is ignored with a warning. This is meant to reduce "
-"packing time on multiprocessor machines. The required amount of memory for "
-"the delta search window is however multiplied by the number of threads. "
-"Specifying 0 will cause Git to auto-detect the number of CPU's and set the "
-"number of threads accordingly."
+#, priority:100
+msgid "Specifies the number of threads to spawn when searching for best delta matches. This requires that pack-objects be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:254
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-true-parents"
msgstr "--keep-true-parents"
#. type: Plain text
#: en/git-pack-objects.txt:257
+#, priority:100
msgid "With this option, parents that are hidden by grafts are packed nevertheless."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:258 en/rev-list-options.txt:735
-#, no-wrap
+#, no-wrap, priority:260
msgid "--filter=<filter-spec>"
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:262
-msgid ""
-"Requires `--stdout`. Omits certain objects (usually blobs) from the "
-"resulting packfile. See linkgit:git-rev-list[1] for valid `<filter-spec>` "
-"forms."
+#, priority:100
+msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resulting packfile. See linkgit:git-rev-list[1] for valid `<filter-spec>` forms."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:263 en/rev-list-options.txt:782
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
#. type: Plain text
#: en/git-pack-objects.txt:265
+#, priority:100
msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:266 en/rev-list-options.txt:789
-#, no-wrap
+#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:269 en/rev-list-options.txt:792
-msgid ""
-"A debug option to help with future \"partial clone\" development. This "
-"option specifies how missing objects are handled."
+#, priority:260
+msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:272
-msgid ""
-"The form '--missing=error' requests that pack-objects stop with an error if "
-"a missing object is encountered. This is the default action."
+#, priority:100
+msgid "The form '--missing=error' requests that pack-objects stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:276 en/rev-list-options.txt:799
-msgid ""
-"The form '--missing=allow-any' will allow object traversal to continue if a "
-"missing object is encountered. Missing objects will silently be omitted "
-"from the results."
+#, priority:260
+msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:280
-msgid ""
-"The form '--missing=allow-promisor' is like 'allow-any', but will only allow "
-"object traversal to continue for EXPECTED promisor missing objects. "
-"Unexpected missing object will raise an error."
+#, priority:100
+msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing object will raise an error."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:281 en/rev-list-options.txt:807
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
#. type: Plain text
#: en/git-pack-objects.txt:287
-msgid ""
-"Omit objects that are known to be in the promisor remote. (This option has "
-"the purpose of operating only on locally created objects, so that when we "
-"repack, we still maintain a distinction between locally created objects "
-"[without .promisor] and objects from the promisor remote [with .promisor].) "
-"This is used with partial clone."
+#, priority:100
+msgid "Omit objects that are known to be in the promisor remote. (This option has the purpose of operating only on locally created objects, so that when we repack, we still maintain a distinction between locally created objects [without .promisor] and objects from the promisor remote [with .promisor].) This is used with partial clone."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:288 en/git-repack.txt:157
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
#. type: Plain text
#: en/git-pack-objects.txt:293
-msgid ""
-"Objects unreachable from the refs in packs named with --unpacked= option are "
-"added to the resulting pack, in addition to the reachable objects that are "
-"not in packs marked with *.keep files. This implies `--revs`."
+#, priority:100
+msgid "Objects unreachable from the refs in packs named with --unpacked= option are added to the resulting pack, in addition to the reachable objects that are not in packs marked with *.keep files. This implies `--revs`."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:294
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--pack-loose-unreachable"
msgstr "--pack-loose-unreachable"
#. type: Plain text
#: en/git-pack-objects.txt:297
-msgid ""
-"Pack unreachable loose objects (and their loose counterparts removed). This "
-"implies `--revs`."
+#, priority:100
+msgid "Pack unreachable loose objects (and their loose counterparts removed). This implies `--revs`."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:298
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unpack-unreachable"
msgstr "--unpack-unreachable"
#. type: Plain text
#: en/git-pack-objects.txt:300
+#, priority:100
msgid "Keep unreachable objects in loose form. This implies `--revs`."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:301 en/git-repack.txt:164
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--delta-islands"
msgstr "--delta-islands"
#. type: Plain text
#: en/git-pack-objects.txt:304
+#, priority:100
msgid "Restrict delta matches based on \"islands\". See DELTA ISLANDS below."
msgstr ""
#. type: Title -
#: en/git-pack-objects.txt:307
-#, no-wrap
+#, no-wrap, priority:100
msgid "DELTA ISLANDS"
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:319
-msgid ""
-"When possible, `pack-objects` tries to reuse existing on-disk deltas to "
-"avoid having to search for new ones on the fly. This is an important "
-"optimization for serving fetches, because it means the server can avoid "
-"inflating most objects at all and just send the bytes directly from "
-"disk. This optimization can't work when an object is stored as a delta "
-"against a base which the receiver does not have (and which we are not "
-"already sending). In that case the server \"breaks\" the delta and has to "
-"find a new one, which has a high CPU cost. Therefore it's important for "
-"performance that the set of objects in on-disk delta relationships match "
-"what a client would fetch."
+#, priority:100
+msgid "When possible, `pack-objects` tries to reuse existing on-disk deltas to avoid having to search for new ones on the fly. This is an important optimization for serving fetches, because it means the server can avoid inflating most objects at all and just send the bytes directly from disk. This optimization can't work when an object is stored as a delta against a base which the receiver does not have (and which we are not already sending). In that case the server \"breaks\" the delta and has to find a new one, which has a high CPU cost. Therefore it's important for performance that the set of objects in on-disk delta relationships match what a client would fetch."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:324
-msgid ""
-"In a normal repository, this tends to work automatically. The objects are "
-"mostly reachable from the branches and tags, and that's what clients "
-"fetch. Any deltas we find on the server are likely to be between objects the "
-"client has or will have."
+#, priority:100
+msgid "In a normal repository, this tends to work automatically. The objects are mostly reachable from the branches and tags, and that's what clients fetch. Any deltas we find on the server are likely to be between objects the client has or will have."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:334
-msgid ""
-"But in some repository setups, you may have several related but separate "
-"groups of ref tips, with clients tending to fetch those groups "
-"independently. For example, imagine that you are hosting several \"forks\" "
-"of a repository in a single shared object store, and letting clients view "
-"them as separate repositories through `GIT_NAMESPACE` or separate repos "
-"using the alternates mechanism. A naive repack may find that the optimal "
-"delta for an object is against a base that is only found in another "
-"fork. But when a client fetches, they will not have the base object, and "
-"we'll have to find a new delta on the fly."
+#, priority:100
+msgid "But in some repository setups, you may have several related but separate groups of ref tips, with clients tending to fetch those groups independently. For example, imagine that you are hosting several \"forks\" of a repository in a single shared object store, and letting clients view them as separate repositories through `GIT_NAMESPACE` or separate repos using the alternates mechanism. A naive repack may find that the optimal delta for an object is against a base that is only found in another fork. But when a client fetches, they will not have the base object, and we'll have to find a new delta on the fly."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:340
-msgid ""
-"A similar situation may exist if you have many refs outside of `refs/heads/` "
-"and `refs/tags/` that point to related objects (e.g., `refs/pull` or "
-"`refs/changes` used by some hosting providers). By default, clients fetch "
-"only heads and tags, and deltas against objects found only in those other "
-"groups cannot be sent as-is."
+#, priority:100
+msgid "A similar situation may exist if you have many refs outside of `refs/heads/` and `refs/tags/` that point to related objects (e.g., `refs/pull` or `refs/changes` used by some hosting providers). By default, clients fetch only heads and tags, and deltas against objects found only in those other groups cannot be sent as-is."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:348
-msgid ""
-"Delta islands solve this problem by allowing you to group your refs into "
-"distinct \"islands\". Pack-objects computes which objects are reachable from "
-"which islands, and refuses to make a delta from an object `A` against a base "
-"which is not present in all of `A`'s islands. This results in slightly "
-"larger packs (because we miss some delta opportunities), but guarantees that "
-"a fetch of one island will not have to recompute deltas on the fly due to "
-"crossing island boundaries."
+#, priority:100
+msgid "Delta islands solve this problem by allowing you to group your refs into distinct \"islands\". Pack-objects computes which objects are reachable from which islands, and refuses to make a delta from an object `A` against a base which is not present in all of `A`'s islands. This results in slightly larger packs (because we miss some delta opportunities), but guarantees that a fetch of one island will not have to recompute deltas on the fly due to crossing island boundaries."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:354
-msgid ""
-"When repacking with delta islands the delta window tends to get clogged with "
-"candidates that are forbidden by the config. Repacking with a big --window "
-"helps (and doesn't take as long as it otherwise might because we can reject "
-"some object pairs based on islands before doing any computation on the "
-"content)."
+#, priority:100
+msgid "When repacking with delta islands the delta window tends to get clogged with candidates that are forbidden by the config. Repacking with a big --window helps (and doesn't take as long as it otherwise might because we can reject some object pairs based on islands before doing any computation on the content)."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:358
-msgid ""
-"Islands are configured via the `pack.island` option, which can be specified "
-"multiple times. Each value is a left-anchored regular expressions matching "
-"refnames. For example:"
+#, priority:100
+msgid "Islands are configured via the `pack.island` option, which can be specified multiple times. Each value is a left-anchored regular expressions matching refnames. For example:"
msgstr ""
#. type: delimited block -
#: en/git-pack-objects.txt:363
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[pack]\n"
"island = refs/heads/\n"
@@ -41696,36 +35569,25 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:370
-msgid ""
-"puts heads and tags into an island (whose name is the empty string; see "
-"below for more on naming). Any refs which do not match those regular "
-"expressions (e.g., `refs/pull/123`) is not in any island. Any object which "
-"is reachable only from `refs/pull/` (but not heads or tags) is therefore not "
-"a candidate to be used as a base for `refs/heads/`."
+#, priority:100
+msgid "puts heads and tags into an island (whose name is the empty string; see below for more on naming). Any refs which do not match those regular expressions (e.g., `refs/pull/123`) is not in any island. Any object which is reachable only from `refs/pull/` (but not heads or tags) is therefore not a candidate to be used as a base for `refs/heads/`."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:378
-msgid ""
-"Refs are grouped into islands based on their \"names\", and two regexes that "
-"produce the same name are considered to be in the same island. The names are "
-"computed from the regexes by concatenating any capture groups from the "
-"regex, with a '-' dash in between. (And if there are no capture groups, then "
-"the name is the empty string, as in the above example.) This allows you to "
-"create arbitrary numbers of islands. Only up to 14 such capture groups are "
-"supported though."
+#, priority:100
+msgid "Refs are grouped into islands based on their \"names\", and two regexes that produce the same name are considered to be in the same island. The names are computed from the regexes by concatenating any capture groups from the regex, with a '-' dash in between. (And if there are no capture groups, then the name is the empty string, as in the above example.) This allows you to create arbitrary numbers of islands. Only up to 14 such capture groups are supported though."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:382
-msgid ""
-"For example, imagine you store the refs for each fork in `refs/virtual/ID`, "
-"where `ID` is a numeric identifier. You might then configure:"
+#, priority:100
+msgid "For example, imagine you store the refs for each fork in `refs/virtual/ID`, where `ID` is a numeric identifier. You might then configure:"
msgstr ""
#. type: delimited block -
#: en/git-pack-objects.txt:388
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[pack]\n"
"island = refs/virtual/([0-9]+)/heads/\n"
@@ -41735,379 +35597,313 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:393
-msgid ""
-"That puts the heads and tags for each fork in their own island (named "
-"\"1234\" or similar), and the pull refs for each go into their own "
-"\"1234-pull\"."
+#, priority:100
+msgid "That puts the heads and tags for each fork in their own island (named \"1234\" or similar), and the pull refs for each go into their own \"1234-pull\"."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:397
-msgid ""
-"Note that we pick a single island for each regex to go into, using \"last "
-"one wins\" ordering (which allows repo-specific config to take precedence "
-"over user-wide config, and so forth)."
+#, priority:100
+msgid "Note that we pick a single island for each regex to go into, using \"last one wins\" ordering (which allows repo-specific config to take precedence over user-wide config, and so forth)."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:403
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
-msgstr ""
-"linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
+msgstr "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-pack-redundant(1)"
msgstr "git-pack-redundant(1)"
#. type: Plain text
#: en/git-pack-redundant.txt:7
+#, priority:100
msgid "git-pack-redundant - Find redundant pack files"
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:13
-#, no-wrap
-msgid ""
-"'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename "
-"... >\n"
+#, ignore-ellipsis, no-wrap, priority:100
+msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:19
-msgid ""
-"This program computes which packs in your repository are redundant. The "
-"output is suitable for piping to `xargs rm` if you are in the root of the "
-"repository."
+#, priority:100
+msgid "This program computes which packs in your repository are redundant. The output is suitable for piping to `xargs rm` if you are in the root of the repository."
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:24
-msgid ""
-"'git pack-redundant' accepts a list of objects on standard input. Any "
-"objects given will be ignored when checking which packs are required. This "
-"makes the following command useful when wanting to remove packs which "
-"contain unreachable objects."
+#, priority:100
+msgid "'git pack-redundant' accepts a list of objects on standard input. Any objects given will be ignored when checking which packs are required. This makes the following command useful when wanting to remove packs which contain unreachable objects."
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:27
-msgid ""
-"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all "
-"| xargs rm"
+#, priority:100
+msgid "git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all | xargs rm"
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:34
+#, priority:100
msgid "Processes all packs. Any filenames on the command line are ignored."
msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--alt-odb"
msgstr "--alt-odb"
#. type: Plain text
#: en/git-pack-redundant.txt:38
-msgid ""
-"Don't require objects present in packs from alternate object directories to "
-"be present in local packs."
+#, priority:100
+msgid "Don't require objects present in packs from alternate object directories to be present in local packs."
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:41
+#, priority:100
msgid "Outputs some statistics to stderr. Has a small performance penalty."
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:47
#, ignore-same, priority:100
-msgid ""
-"linkgit:git-pack-objects[1] linkgit:git-repack[1] "
-"linkgit:git-prune-packed[1]"
-msgstr ""
-"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
+msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-pack-refs.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-pack-refs(1)"
msgstr "git-pack-refs(1)"
#. type: Plain text
#: en/git-pack-refs.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-pack-refs - Pack heads and tags for efficient repository access"
msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
#. type: Plain text
#: en/git-pack-refs.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git pack-refs' [--all] [--no-prune]\n"
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:24
-msgid ""
-"Traditionally, tips of branches and tags (collectively known as 'refs') were "
-"stored one file per ref in a (sub)directory under `$GIT_DIR/refs` "
-"directory. While many branch tips tend to be updated often, most tags and "
-"some branch tips are never updated. When a repository has hundreds or "
-"thousands of tags, this one-file-per-ref format both wastes storage and "
-"hurts performance."
+#, priority:100
+msgid "Traditionally, tips of branches and tags (collectively known as 'refs') were stored one file per ref in a (sub)directory under `$GIT_DIR/refs` directory. While many branch tips tend to be updated often, most tags and some branch tips are never updated. When a repository has hundreds or thousands of tags, this one-file-per-ref format both wastes storage and hurts performance."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:31
-msgid ""
-"This command is used to solve the storage and performance problem by storing "
-"the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing "
-"from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in "
-"this file and used if found."
+#, priority:100
+msgid "This command is used to solve the storage and performance problem by storing the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in this file and used if found."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:34
-msgid ""
-"Subsequent updates to branches always create new files under `$GIT_DIR/refs` "
-"directory hierarchy."
+#, priority:100
+msgid "Subsequent updates to branches always create new files under `$GIT_DIR/refs` directory hierarchy."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:43
-msgid ""
-"A recommended practice to deal with a repository with too many refs is to "
-"pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags "
-"are by definition stationary and are not expected to change. Branch heads "
-"will be packed with the initial `pack-refs --all`, but only the currently "
-"active branch heads will become unpacked, and the next `pack-refs` (without "
-"`--all`) will leave them unpacked."
+#, priority:100
+msgid "A recommended practice to deal with a repository with too many refs is to pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags are by definition stationary and are not expected to change. Branch heads will be packed with the initial `pack-refs --all`, but only the currently active branch heads will become unpacked, and the next `pack-refs` (without `--all`) will leave them unpacked."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:56
-msgid ""
-"The command by default packs all tags and refs that are already packed, and "
-"leaves other refs alone. This is because branches are expected to be "
-"actively developed and packing their tips does not help performance. This "
-"option causes branch tips to be packed as well. Useful for a repository "
-"with many branches of historical interests."
+#, priority:100
+msgid "The command by default packs all tags and refs that are already packed, and leaves other refs alone. This is because branches are expected to be actively developed and packing their tips does not help performance. This option causes branch tips to be packed as well. Useful for a repository with many branches of historical interests."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:61
-msgid ""
-"The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after "
-"packing them. This option tells it not to."
+#, priority:100
+msgid "The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after packing them. This option tells it not to."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:69
-msgid ""
-"Older documentation written before the packed-refs mechanism was introduced "
-"may still say things like \".git/refs/heads/<branch> file exists\" when it "
-"means \"branch <branch> exists\"."
+#, priority:100
+msgid "Older documentation written before the packed-refs mechanism was introduced may still say things like \".git/refs/heads/<branch> file exists\" when it means \"branch <branch> exists\"."
msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-parse-remote(1)"
msgstr "git-parse-remote(1)"
#. type: Plain text
#: en/git-parse-remote.txt:7
-#, fuzzy
-msgid ""
-"git-parse-remote - Routines to help parsing remote repository access "
-"parameters"
-msgstr ""
-"Rutinas para ayudar a analizar los par찼metros de acceso del repositorio "
-"remoto"
+#, fuzzy, priority:100
+msgid "git-parse-remote - Routines to help parsing remote repository access parameters"
+msgstr "Rutinas para ayudar a analizar los par찼metros de acceso del repositorio remoto"
#. type: Plain text
#: en/git-parse-remote.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'. \"$(git --exec-path)/git-parse-remote\"'\n"
msgstr ""
#. type: Plain text
#: en/git-parse-remote.txt:20
-msgid ""
-"This script is included in various scripts to supply routines to parse files "
-"under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables "
-"that are related to fetching, pulling and pushing."
+#, priority:100
+msgid "This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing."
msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-patch-id(1)"
msgstr "git-patch-id(1)"
#. type: Plain text
#: en/git-patch-id.txt:7
+#, priority:100
msgid "git-patch-id - Compute unique ID for a patch"
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git patch-id' [--stable | --unstable]\n"
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:16
+#, priority:100
msgid "Read a patch from the standard input and compute the patch ID for it."
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:21
-msgid ""
-"A \"patch ID\" is nothing but a sum of SHA-1 of the file diffs associated "
-"with a patch, with whitespace and line numbers ignored. As such, it's "
-"\"reasonably stable\", but at the same time also reasonably unique, i.e., "
-"two patches that have the same \"patch ID\" are almost guaranteed to be the "
-"same thing."
+#, priority:100
+msgid "A \"patch ID\" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with whitespace and line numbers ignored. As such, it's \"reasonably stable\", but at the same time also reasonably unique, i.e., two patches that have the same \"patch ID\" are almost guaranteed to be the same thing."
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:23
+#, priority:100
msgid "IOW, you can use this thing to look for likely duplicate commits."
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:29
-msgid ""
-"When dealing with 'git diff-tree' output, it takes advantage of the fact "
-"that the patch is prefixed with the object name of the commit, and outputs "
-"two 40-byte hexadecimal strings. The first string is the patch ID, and the "
-"second string is the commit ID. This can be used to make a mapping from "
-"patch ID to commit ID."
+#, priority:100
+msgid "When dealing with 'git diff-tree' output, it takes advantage of the fact that the patch is prefixed with the object name of the commit, and outputs two 40-byte hexadecimal strings. The first string is the patch ID, and the second string is the commit ID. This can be used to make a mapping from patch ID to commit ID."
msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stable"
msgstr "--stable"
#. type: Plain text
#: en/git-patch-id.txt:35
+#, priority:100
msgid "Use a \"stable\" sum of hashes as the patch ID. With this option:"
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:41
-msgid ""
-"Reordering file diffs that make up a patch does not affect the ID. In "
-"particular, two patches produced by comparing the same two trees with two "
-"different settings for \"-O<orderfile>\" result in the same patch ID "
-"signature, thereby allowing the computed result to be used as a key to index "
-"some meta-information about the change between the two trees;"
+#, priority:100
+msgid "Reordering file diffs that make up a patch does not affect the ID. In particular, two patches produced by comparing the same two trees with two different settings for \"-O<orderfile>\" result in the same patch ID signature, thereby allowing the computed result to be used as a key to index some meta-information about the change between the two trees;"
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:47
-msgid ""
-"Result is different from the value produced by git 1.9 and older or produced "
-"when an \"unstable\" hash (see --unstable below) is configured - even when "
-"used on a diff output taken without any use of \"-O<orderfile>\", thereby "
-"making existing databases storing such \"unstable\" or historical patch-ids "
-"unusable."
+#, priority:100
+msgid "Result is different from the value produced by git 1.9 and older or produced when an \"unstable\" hash (see --unstable below) is configured - even when used on a diff output taken without any use of \"-O<orderfile>\", thereby making existing databases storing such \"unstable\" or historical patch-ids unusable."
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:49
-#, no-wrap
+#, no-wrap, priority:100
msgid "This is the default if patchid.stable is set to true.\n"
msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unstable"
msgstr "--unstable"
#. type: Plain text
#: en/git-patch-id.txt:56
-msgid ""
-"Use an \"unstable\" hash as the patch ID. With this option, the result "
-"produced is compatible with the patch-id value produced by git 1.9 and "
-"older. Users with pre-existing databases storing patch-ids produced by git "
-"1.9 and older (who do not deal with reordered patches) may want to use this "
-"option."
+#, priority:100
+msgid "Use an \"unstable\" hash as the patch ID. With this option, the result produced is compatible with the patch-id value produced by git 1.9 and older. Users with pre-existing databases storing patch-ids produced by git 1.9 and older (who do not deal with reordered patches) may want to use this option."
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:58
+#, priority:100
msgid "This is the default."
msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-prune-packed(1)"
msgstr "git-prune-packed(1)"
#. type: Plain text
#: en/git-prune-packed.txt:7
+#, priority:100
msgid "git-prune-packed - Remove extra objects that are already in pack files"
msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'git prune-packed' [-n|--dry-run] [-q|--quiet]\n"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
#. type: Plain text
#: en/git-prune-packed.txt:19
-msgid ""
-"This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that "
-"currently exist in a pack file as well as the independent object "
-"directories."
+#, priority:100
+msgid "This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that currently exist in a pack file as well as the independent object directories."
msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:21
+#, priority:100
msgid "All such extra objects are removed."
msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:24 en/git-repack.txt:24
-msgid ""
-"A pack is a collection of objects, individually compressed, with delta "
-"compression applied, stored in a single file, with an associated index file."
+#, priority:100
+msgid "A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an associated index file."
msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:27 en/git-repack.txt:27
-msgid ""
-"Packs are used to reduce the load on mirror systems, backup engines, disk "
-"storage, etc."
+#, priority:100
+msgid "Packs are used to reduce the load on mirror systems, backup engines, disk storage, etc."
msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:35
-msgid ""
-"Don't actually remove any objects, only show those that would have been "
-"removed."
+#, priority:100
+msgid "Don't actually remove any objects, only show those that would have been removed."
msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:39
+#, priority:100
msgid "Squelch the progress indicator."
msgstr ""
@@ -42119,114 +35915,104 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Title =
#: en/git-prune.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-prune(1)"
msgstr "git-prune(1)"
#. type: Plain text
#: en/git-prune.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-prune - Prune all unreachable objects from the object database"
msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
#. type: Plain text
#: en/git-prune.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
#. type: Plain text
#: en/git-prune.txt:19
-msgid ""
-"In most cases, users should run 'git gc', which calls 'git prune'. See the "
-"section \"NOTES\", below."
+#, priority:100
+msgid "In most cases, users should run 'git gc', which calls 'git prune'. See the section \"NOTES\", below."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:29
-msgid ""
-"This runs 'git fsck --unreachable' using all the refs available in `refs/`, "
-"optionally with additional set of objects specified on the command line, and "
-"prunes all unpacked objects unreachable from any of these head objects from "
-"the object database. In addition, it prunes the unpacked objects that are "
-"also found in packs by running 'git prune-packed'. It also removes entries "
-"from .git/shallow that are not reachable by any ref."
+#, priority:100
+msgid "This runs 'git fsck --unreachable' using all the refs available in `refs/`, optionally with additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from the object database. In addition, it prunes the unpacked objects that are also found in packs by running 'git prune-packed'. It also removes entries from .git/shallow that are not reachable by any ref."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:32
-msgid ""
-"Note that unreachable, packed objects will remain. If this is not desired, "
-"see linkgit:git-repack[1]."
+#, priority:100
+msgid "Note that unreachable, packed objects will remain. If this is not desired, see linkgit:git-repack[1]."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:40
+#, priority:100
msgid "Do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:44
+#, priority:100
msgid "Report all removed objects."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:47
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show progress."
msgstr "mostrar progreso"
#. type: Labeled list
#: en/git-prune.txt:48 en/git-worktree.txt:192
-#, no-wrap
+#, no-wrap, priority:240
msgid "--expire <time>"
msgstr ""
#. type: Plain text
#: en/git-prune.txt:50
+#, priority:100
msgid "Only expire loose objects older than <time>."
msgstr ""
#. type: Labeled list
#: en/git-prune.txt:54
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<head>..."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:58
-msgid ""
-"In addition to objects reachable from any of our references, keep objects "
-"reachable from listed <head>s."
+#, priority:100
+msgid "In addition to objects reachable from any of our references, keep objects reachable from listed <head>s."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:65
-msgid ""
-"To prune objects not used by your repository or another that borrows from "
-"your repository via its `.git/objects/info/alternates`:"
+#, priority:100
+msgid "To prune objects not used by your repository or another that borrows from your repository via its `.git/objects/info/alternates`:"
msgstr ""
#. type: delimited block -
#: en/git-prune.txt:68
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git prune $(cd ../another && git rev-parse --all)\n"
msgstr ""
#. type: Plain text
#: en/git-prune.txt:76
-msgid ""
-"In most cases, users will not need to call 'git prune' directly, but should "
-"instead call 'git gc', which handles pruning along with many other "
-"housekeeping tasks."
+#, priority:100
+msgid "In most cases, users will not need to call 'git prune' directly, but should instead call 'git gc', which handles pruning along with many other housekeeping tasks."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:79
-msgid ""
-"For a description of which objects are considered for pruning, see 'git "
-"fsck''s --unreachable option."
+#, priority:100
+msgid "For a description of which objects are considered for pruning, see 'git fsck''s --unreachable option."
msgstr ""
#. type: Plain text
@@ -42237,64 +36023,49 @@ msgstr "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
#. type: Title =
#: en/git-pull.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "git-pull(1)"
msgstr "git-pull(1)"
#. type: Plain text
#: en/git-pull.txt:7
-#, fuzzy
-msgid ""
-"git-pull - Fetch from and integrate with another repository or a local "
-"branch"
+#, fuzzy, priority:220
+msgid "git-pull - Fetch from and integrate with another repository or a local branch"
msgstr "Realiza un fetch e integra con otro repositorio o rama local"
#. type: Plain text
#: en/git-pull.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
-msgstr ""
-"git pull [<opciones>] [<repositorio> [<especificaci처n-de-referencia>...]]"
+msgstr "git pull [<opciones>] [<repositorio> [<especificaci처n-de-referencia>...]]"
#. type: Plain text
#: en/git-pull.txt:21
-msgid ""
-"Incorporates changes from a remote repository into the current branch. In "
-"its default mode, `git pull` is shorthand for `git fetch` followed by `git "
-"merge FETCH_HEAD`."
+#, priority:220
+msgid "Incorporates changes from a remote repository into the current branch. In its default mode, `git pull` is shorthand for `git fetch` followed by `git merge FETCH_HEAD`."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:26
-msgid ""
-"More precisely, 'git pull' runs 'git fetch' with the given parameters and "
-"calls 'git merge' to merge the retrieved branch heads into the current "
-"branch. With `--rebase`, it runs 'git rebase' instead of 'git merge'."
+#, priority:220
+msgid "More precisely, 'git pull' runs 'git fetch' with the given parameters and calls 'git merge' to merge the retrieved branch heads into the current branch. With `--rebase`, it runs 'git rebase' instead of 'git merge'."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:33
-msgid ""
-"<repository> should be the name of a remote repository as passed to "
-"linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for "
-"example, the name of a tag) or even a collection of refs with corresponding "
-"remote-tracking branches (e.g., "
-"refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the "
-"name of a branch in the remote repository."
+#, priority:220
+msgid "<repository> should be the name of a remote repository as passed to linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote-tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the name of a branch in the remote repository."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:37
-msgid ""
-"Default values for <repository> and <branch> are read from the \"remote\" "
-"and \"merge\" configuration for the current branch as set by "
-"linkgit:git-branch[1] `--track`."
+#, priority:220
+msgid "Default values for <repository> and <branch> are read from the \"remote\" and \"merge\" configuration for the current branch as set by linkgit:git-branch[1] `--track`."
msgstr ""
#. type: delimited block -
#: en/git-pull.txt:47
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\t A---B---C master on origin\n"
"\t /\n"
@@ -42305,17 +36076,13 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:54
-msgid ""
-"Then \"`git pull`\" will fetch and replay the changes from the remote "
-"`master` branch since it diverged from the local `master` (i.e., `E`) until "
-"its current commit (`C`) on top of `master` and record the result in a new "
-"commit along with the names of the two parent commits and a log message from "
-"the user describing the changes."
+#, priority:220
+msgid "Then \"`git pull`\" will fetch and replay the changes from the remote `master` branch since it diverged from the local `master` (i.e., `E`) until its current commit (`C`) on top of `master` and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
msgstr ""
#. type: delimited block -
#: en/git-pull.txt:59
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\t A---B---C origin/master\n"
"\t / \\\n"
@@ -42324,279 +36091,235 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:63
-msgid ""
-"See linkgit:git-merge[1] for details, including how conflicts are presented "
-"and handled."
+#, priority:220
+msgid "See linkgit:git-merge[1] for details, including how conflicts are presented and handled."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:68
-msgid ""
-"In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset "
-"--merge`. *Warning*: In older versions of Git, running 'git pull' with "
-"uncommitted changes is discouraged: while possible, it leaves you in a state "
-"that may be hard to back out of in the case of a conflict."
+#, priority:220
+msgid "In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --merge`. *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:73
-msgid ""
-"If any of the remote changes overlap with local uncommitted changes, the "
-"merge will be automatically canceled and the work tree untouched. It is "
-"generally best to get any local changes in working order before pulling or "
-"stash them away with linkgit:git-stash[1]."
+#, priority:220
+msgid "If any of the remote changes overlap with local uncommitted changes, the merge will be automatically canceled and the work tree untouched. It is generally best to get any local changes in working order before pulling or stash them away with linkgit:git-stash[1]."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:82
-msgid ""
-"This is passed to both underlying git-fetch to squelch reporting of during "
-"transfer, and underlying git-merge to squelch output during merging."
+#, priority:220
+msgid "This is passed to both underlying git-fetch to squelch reporting of during transfer, and underlying git-merge to squelch output during merging."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:86
+#, priority:220
msgid "Pass --verbose to git-fetch and git-merge."
msgstr ""
#. type: Labeled list
#: en/git-pull.txt:87
-#, no-wrap
+#, no-wrap, priority:220
msgid "--[no-]recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
#: en/git-pull.txt:91
-msgid ""
-"This option controls if new commits of all populated submodules should be "
-"fetched and updated, too (see linkgit:git-config[1] and "
-"linkgit:gitmodules[5])."
+#, priority:220
+msgid "This option controls if new commits of all populated submodules should be fetched and updated, too (see linkgit:git-config[1] and linkgit:gitmodules[5])."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:93
-msgid ""
-"If the checkout is done via rebase, local submodule commits are rebased as "
-"well."
+#, priority:220
+msgid "If the checkout is done via rebase, local submodule commits are rebased as well."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:95
-msgid ""
-"If the update is done via merge, the submodule conflicts are resolved and "
-"checked out."
+#, priority:220
+msgid "If the update is done via merge, the submodule conflicts are resolved and checked out."
msgstr ""
#. type: Title ~
#: en/git-pull.txt:97
-#, no-wrap
+#, no-wrap, priority:220
msgid "Options related to merging"
msgstr "Opciones relacionadas a fusi처n"
#. type: Labeled list
#: en/git-pull.txt:104
-#, no-wrap
+#, no-wrap, priority:220
msgid "--rebase[=false|true|merges|preserve|interactive]"
msgstr ""
#. type: Plain text
#: en/git-pull.txt:110
-msgid ""
-"When true, rebase the current branch on top of the upstream branch after "
-"fetching. If there is a remote-tracking branch corresponding to the upstream "
-"branch and the upstream branch was rebased since last fetched, the rebase "
-"uses that information to avoid rebasing non-local changes."
+#, priority:220
+msgid "When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:114
-msgid ""
-"When set to `merges`, rebase using `git rebase --rebase-merges` so that the "
-"local merge commits are included in the rebase (see linkgit:git-rebase[1] "
-"for details)."
+#, priority:220
+msgid "When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details)."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:118
-msgid ""
-"When set to `preserve` (deprecated in favor of `merges`), rebase with the "
-"`--preserve-merges` option passed to `git rebase` so that locally created "
-"merge commits will not be flattened."
+#, priority:220
+msgid "When set to `preserve` (deprecated in favor of `merges`), rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:120
+#, priority:220
msgid "When false, merge the current branch into the upstream branch."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:122
+#, priority:220
msgid "When `interactive`, enable the interactive mode of rebase."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:126
-msgid ""
-"See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in "
-"linkgit:git-config[1] if you want to make `git pull` always use `--rebase` "
-"instead of merging."
+#, priority:220
+msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:132
-msgid ""
-"This is a potentially _dangerous_ mode of operation. It rewrites history, "
-"which does not bode well when you published that history already. Do *not* "
-"use this option unless you have read linkgit:git-rebase[1] carefully."
+#, priority:220
+msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
msgstr ""
#. type: Labeled list
#: en/git-pull.txt:133 en/git-svn.txt:261
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--no-rebase"
msgstr "--no-rebase"
#. type: Plain text
#: en/git-pull.txt:135
+#, priority:220
msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
-#, no-wrap
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
-#, no-wrap
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
#. type: Plain text
#: en/git-pull.txt:142
-msgid ""
-"Before starting rebase, stash local modifications away (see "
-"linkgit:git-stash[1]) if needed, and apply the stash entry when "
-"done. `--no-autostash` is useful to override the `rebase.autoStash` "
-"configuration variable (see linkgit:git-config[1])."
+#, priority:220
+msgid "Before starting rebase, stash local modifications away (see linkgit:git-stash[1]) if needed, and apply the stash entry when done. `--no-autostash` is useful to override the `rebase.autoStash` configuration variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:144
+#, priority:220
msgid "This option is only valid when \"--rebase\" is used."
msgstr ""
#. type: Title ~
#: en/git-pull.txt:146
-#, no-wrap
+#, no-wrap, priority:220
msgid "Options related to fetching"
msgstr "Opciones relacionadas a fetch"
#. type: Title -
#: en/git-pull.txt:157
-#, no-wrap
+#, no-wrap, priority:220
msgid "DEFAULT BEHAVIOUR"
msgstr ""
#. type: Plain text
#: en/git-pull.txt:164
-msgid ""
-"Often people use `git pull` without giving any parameter. Traditionally, "
-"this has been equivalent to saying `git pull origin`. However, when "
-"configuration `branch.<name>.remote` is present while on branch `<name>`, "
-"that value is used instead of `origin`."
+#, priority:220
+msgid "Often people use `git pull` without giving any parameter. Traditionally, this has been equivalent to saying `git pull origin`. However, when configuration `branch.<name>.remote` is present while on branch `<name>`, that value is used instead of `origin`."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:169
-msgid ""
-"In order to determine what URL to use to fetch from, the value of the "
-"configuration `remote.<origin>.url` is consulted and if there is not any "
-"such variable, the value on the `URL:` line in `$GIT_DIR/remotes/<origin>` "
-"is used."
+#, priority:220
+msgid "In order to determine what URL to use to fetch from, the value of the configuration `remote.<origin>.url` is consulted and if there is not any such variable, the value on the `URL:` line in `$GIT_DIR/remotes/<origin>` is used."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:178
-msgid ""
-"In order to determine what remote branches to fetch (and optionally store in "
-"the remote-tracking branches) when the command is run without any refspec "
-"parameters on the command line, values of the configuration variable "
-"`remote.<origin>.fetch` are consulted, and if there aren't any, "
-"`$GIT_DIR/remotes/<origin>` is consulted and its `Pull:` lines are used. In "
-"addition to the refspec formats described in the OPTIONS section, you can "
-"have a globbing refspec that looks like this:"
+#, priority:220
+msgid "In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote.<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` is consulted and its `Pull:` lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:"
msgstr ""
#. type: delimited block -
#: en/git-pull.txt:181
-#, no-wrap
+#, no-wrap, priority:220
msgid "refs/heads/*:refs/remotes/origin/*\n"
msgstr ""
#. type: Plain text
#: en/git-pull.txt:188
-msgid ""
-"A globbing refspec must have a non-empty RHS (i.e. must store what were "
-"fetched in remote-tracking branches), and its LHS and RHS must end with "
-"`/*`. The above specifies that all remote branches are tracked using "
-"remote-tracking branches in `refs/remotes/origin/` hierarchy under the same "
-"name."
+#, priority:220
+msgid "A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS must end with `/*`. The above specifies that all remote branches are tracked using remote-tracking branches in `refs/remotes/origin/` hierarchy under the same name."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:192
-msgid ""
-"The rule to determine which remote branch to merge after fetching is a bit "
-"involved, in order not to break backward compatibility."
+#, priority:220
+msgid "The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:195
-msgid ""
-"If explicit refspecs were given on the command line of `git pull`, they are "
-"all merged."
+#, priority:220
+msgid "If explicit refspecs were given on the command line of `git pull`, they are all merged."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:200
-msgid ""
-"When no refspec was given on the command line, then `git pull` uses the "
-"refspec from the configuration or `$GIT_DIR/remotes/<origin>`. In such "
-"cases, the following rules apply:"
+#, priority:220
+msgid "When no refspec was given on the command line, then `git pull` uses the refspec from the configuration or `$GIT_DIR/remotes/<origin>`. In such cases, the following rules apply:"
msgstr ""
#. type: Plain text
#: en/git-pull.txt:204
-msgid ""
-"If `branch.<name>.merge` configuration for the current branch `<name>` "
-"exists, that is the name of the branch at the remote site that is merged."
+#, priority:220
+msgid "If `branch.<name>.merge` configuration for the current branch `<name>` exists, that is the name of the branch at the remote site that is merged."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:206
+#, priority:220
msgid "If the refspec is a globbing one, nothing is merged."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:208
+#, priority:220
msgid "Otherwise the remote branch of the first refspec is merged."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:216
-msgid ""
-"Update the remote-tracking branches for the repository you cloned from, then "
-"merge one of them into your current branch:"
+#, priority:220
+msgid "Update the remote-tracking branches for the repository you cloned from, then merge one of them into your current branch:"
msgstr ""
#. type: delimited block -
#: en/git-pull.txt:220
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"$ git pull\n"
"$ git pull origin\n"
@@ -42604,34 +36327,31 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:225
-msgid ""
-"Normally the branch merged in is the HEAD of the remote repository, but the "
-"choice is determined by the branch.<name>.remote and branch.<name>.merge "
-"options; see linkgit:git-config[1] for details."
+#, priority:220
+msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:227
+#, priority:220
msgid "Merge into the current branch the remote branch `next`:"
msgstr ""
#. type: delimited block -
#: en/git-pull.txt:230
-#, no-wrap
+#, no-wrap, priority:220
msgid "$ git pull origin next\n"
msgstr ""
#. type: Plain text
#: en/git-pull.txt:235
-msgid ""
-"This leaves a copy of `next` temporarily in FETCH_HEAD, but does not update "
-"any remote-tracking branches. Using remote-tracking branches, the same can "
-"be done by invoking fetch and merge:"
+#, priority:220
+msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, but does not update any remote-tracking branches. Using remote-tracking branches, the same can be done by invoking fetch and merge:"
msgstr ""
#. type: delimited block -
#: en/git-pull.txt:239
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"$ git fetch origin\n"
"$ git merge origin/next\n"
@@ -42639,9 +36359,8 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:244
-msgid ""
-"If you tried a pull which resulted in complex conflicts and would want to "
-"start over, you can recover with 'git reset'."
+#, priority:220
+msgid "If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'."
msgstr ""
#. type: Plain text
@@ -42652,25 +36371,22 @@ msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
#. type: Title =
#: en/git-push.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "git-push(1)"
msgstr "git-push(1)"
#. type: Plain text
#: en/git-push.txt:7
-#, fuzzy
+#, fuzzy, priority:220
msgid "git-push - Update remote refs along with associated objects"
msgstr "Actualiza referencias remotas junto con sus objetos asociados"
#. type: Plain text
#: en/git-push.txt:18
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
-"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | "
-"--dry-run] [--receive-pack=<git-receive-pack>]\n"
-"\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | "
-"--verbose]\n"
+"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
+"\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
"\t [-u | --set-upstream] [-o <string> | --push-option=<string>]\n"
"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
"\t [--force-with-lease[=<refname>[:<expect>]]]\n"
@@ -42679,495 +36395,355 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:24
-msgid ""
-"Updates remote refs using local refs, while sending objects necessary to "
-"complete the given refs."
+#, priority:220
+msgid "Updates remote refs using local refs, while sending objects necessary to complete the given refs."
msgstr ""
#. type: Plain text
#: en/git-push.txt:28
-msgid ""
-"You can make interesting things happen to a repository every time you push "
-"into it, by setting up 'hooks' there. See documentation for "
-"linkgit:git-receive-pack[1]."
+#, priority:220
+msgid "You can make interesting things happen to a repository every time you push into it, by setting up 'hooks' there. See documentation for linkgit:git-receive-pack[1]."
msgstr ""
#. type: Plain text
#: en/git-push.txt:33
-msgid ""
-"When the command line does not specify where to push with the `<repository>` "
-"argument, `branch.*.remote` configuration for the current branch is "
-"consulted to determine where to push. If the configuration is missing, it "
-"defaults to 'origin'."
+#, priority:220
+msgid "When the command line does not specify where to push with the `<repository>` argument, `branch.*.remote` configuration for the current branch is consulted to determine where to push. If the configuration is missing, it defaults to 'origin'."
msgstr ""
#. type: Plain text
#: en/git-push.txt:39
-msgid ""
-"When the command line does not specify what to push with `<refspec>...` "
-"arguments or `--all`, `--mirror`, `--tags` options, the command finds the "
-"default `<refspec>` by consulting `remote.*.push` configuration, and if it "
-"is not found, honors `push.default` configuration to decide what to push "
-"(See linkgit:git-config[1] for the meaning of `push.default`)."
+#, ignore-ellipsis, priority:220
+msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)."
msgstr ""
#. type: Plain text
#: en/git-push.txt:46
-msgid ""
-"When neither the command-line nor the configuration specify what to push, "
-"the default behavior is used, which corresponds to the `simple` value for "
-"`push.default`: the current branch is pushed to the corresponding upstream "
-"branch, but as a safety measure, the push is aborted if the upstream branch "
-"does not have the same name as the local one."
+#, priority:220
+msgid "When neither the command-line nor the configuration specify what to push, the default behavior is used, which corresponds to the `simple` value for `push.default`: the current branch is pushed to the corresponding upstream branch, but as a safety measure, the push is aborted if the upstream branch does not have the same name as the local one."
msgstr ""
#. type: Title -
#: en/git-push.txt:49
-#, no-wrap
+#, no-wrap, priority:220
msgid "OPTIONS[[OPTIONS]]"
msgstr ""
#. type: Plain text
#: en/git-push.txt:55
-msgid ""
-"The \"remote\" repository that is destination of a push operation. This "
-"parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or "
-"the name of a remote (see the section <<REMOTES,REMOTES>> below)."
+#, priority:220
+msgid "The \"remote\" repository that is destination of a push operation. This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:56
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid "<refspec>..."
msgstr ""
#. type: Plain text
#: en/git-push.txt:61
-msgid ""
-"Specify what destination ref to update with what source object. The format "
-"of a <refspec> parameter is an optional plus `+`, followed by the source "
-"object <src>, followed by a colon `:`, followed by the destination ref "
-"<dst>."
+#, priority:220
+msgid "Specify what destination ref to update with what source object. The format of a <refspec> parameter is an optional plus `+`, followed by the source object <src>, followed by a colon `:`, followed by the destination ref <dst>."
msgstr ""
#. type: Plain text
#: en/git-push.txt:65
-msgid ""
-"The <src> is often the name of the branch you would want to push, but it can "
-"be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see "
-"linkgit:gitrevisions[7])."
+#, priority:220
+msgid "The <src> is often the name of the branch you would want to push, but it can be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see linkgit:gitrevisions[7])."
msgstr ""
#. type: Plain text
#: en/git-push.txt:75
-msgid ""
-"The <dst> tells which ref on the remote side is updated with this "
-"push. Arbitrary expressions cannot be used here, an actual ref must be "
-"named. If `git push [<repository>]` without any `<refspec>` argument is set "
-"to update some ref at the destination with `<src>` with "
-"`remote.<repository>.push` configuration variable, `:<dst>` part can be "
-"omitted--such a push will update a ref that `<src>` normally updates without "
-"any `<refspec>` on the command line. Otherwise, missing `:<dst>` means to "
-"update the same ref as the `<src>`."
+#, priority:220
+msgid "The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must be named. If `git push [<repository>]` without any `<refspec>` argument is set to update some ref at the destination with `<src>` with `remote.<repository>.push` configuration variable, `:<dst>` part can be omitted--such a push will update a ref that `<src>` normally updates without any `<refspec>` on the command line. Otherwise, missing `:<dst>` means to update the same ref as the `<src>`."
msgstr ""
#. type: Plain text
#: en/git-push.txt:80
-msgid ""
-"If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will try "
-"to infer where in `refs/*` on the destination <repository> it belongs based "
-"on the type of <src> being pushed and whether <dst> is ambiguous."
+#, priority:220
+msgid "If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will try to infer where in `refs/*` on the destination <repository> it belongs based on the type of <src> being pushed and whether <dst> is ambiguous."
msgstr ""
#. type: Plain text
#: en/git-push.txt:84
-msgid ""
-"If <dst> unambiguously refers to a ref on the <repository> remote, then push "
-"to that ref."
+#, priority:220
+msgid "If <dst> unambiguously refers to a ref on the <repository> remote, then push to that ref."
msgstr ""
#. type: Plain text
#: en/git-push.txt:87
-msgid ""
-"If <src> resolves to a ref starting with refs/heads/ or refs/tags/, then "
-"prepend that to <dst>."
+#, priority:220
+msgid "If <src> resolves to a ref starting with refs/heads/ or refs/tags/, then prepend that to <dst>."
msgstr ""
#. type: Plain text
#: en/git-push.txt:93
-msgid ""
-"Other ambiguity resolutions might be added in the future, but for now any "
-"other cases will error out with an error indicating what we tried, and "
-"depending on the `advice.pushUnqualifiedRefname` configuration (see "
-"linkgit:git-config[1]) suggest what refs/ namespace you may have wanted to "
-"push to."
+#, priority:220
+msgid "Other ambiguity resolutions might be added in the future, but for now any other cases will error out with an error indicating what we tried, and depending on the `advice.pushUnqualifiedRefname` configuration (see linkgit:git-config[1]) suggest what refs/ namespace you may have wanted to push to."
msgstr ""
#. type: Plain text
#: en/git-push.txt:101
-msgid ""
-"The object referenced by <src> is used to update the <dst> reference on the "
-"remote side. Whether this is allowed depends on where in `refs/*` the <dst> "
-"reference lives as described in detail below, in those sections \"update\" "
-"means any modifications except deletes, which as noted after the next few "
-"sections are treated differently."
+#, priority:220
+msgid "The object referenced by <src> is used to update the <dst> reference on the remote side. Whether this is allowed depends on where in `refs/*` the <dst> reference lives as described in detail below, in those sections \"update\" means any modifications except deletes, which as noted after the next few sections are treated differently."
msgstr ""
#. type: Plain text
#: en/git-push.txt:104
-msgid ""
-"The `refs/heads/*` namespace will only accept commit objects, and updates "
-"only if they can be fast-forwarded."
+#, priority:220
+msgid "The `refs/heads/*` namespace will only accept commit objects, and updates only if they can be fast-forwarded."
msgstr ""
#. type: Plain text
#: en/git-push.txt:108
-msgid ""
-"The `refs/tags/*` namespace will accept any kind of object (as commits, "
-"trees and blobs can be tagged), and any updates to them will be rejected."
+#, priority:220
+msgid "The `refs/tags/*` namespace will accept any kind of object (as commits, trees and blobs can be tagged), and any updates to them will be rejected."
msgstr ""
#. type: Plain text
#: en/git-push.txt:113
-msgid ""
-"It's possible to push any type of object to any namespace outside of "
-"`refs/{tags,heads}/*`. In the case of tags and commits, these will be "
-"treated as if they were the commits inside `refs/heads/*` for the purposes "
-"of whether the update is allowed."
+#, priority:220
+msgid "It's possible to push any type of object to any namespace outside of `refs/{tags,heads}/*`. In the case of tags and commits, these will be treated as if they were the commits inside `refs/heads/*` for the purposes of whether the update is allowed."
msgstr ""
#. type: Plain text
#: en/git-push.txt:122
-msgid ""
-"I.e. a fast-forward of commits and tags outside `refs/{tags,heads}/*` is "
-"allowed, even in cases where what's being fast-forwarded is not a commit, "
-"but a tag object which happens to point to a new commit which is a "
-"fast-forward of the commit the last tag (or commit) it's "
-"replacing. Replacing a tag with an entirely different tag is also allowed, "
-"if it points to the same commit, as well as pushing a peeled tag, "
-"i.e. pushing the commit that existing tag object points to, or a new tag "
-"object which an existing commit points to."
+#, priority:220
+msgid "I.e. a fast-forward of commits and tags outside `refs/{tags,heads}/*` is allowed, even in cases where what's being fast-forwarded is not a commit, but a tag object which happens to point to a new commit which is a fast-forward of the commit the last tag (or commit) it's replacing. Replacing a tag with an entirely different tag is also allowed, if it points to the same commit, as well as pushing a peeled tag, i.e. pushing the commit that existing tag object points to, or a new tag object which an existing commit points to."
msgstr ""
#. type: Plain text
#: en/git-push.txt:126
-msgid ""
-"Tree and blob objects outside of `refs/{tags,heads}/*` will be treated the "
-"same way as if they were inside `refs/tags/*`, any update of them will be "
-"rejected."
+#, priority:220
+msgid "Tree and blob objects outside of `refs/{tags,heads}/*` will be treated the same way as if they were inside `refs/tags/*`, any update of them will be rejected."
msgstr ""
#. type: Plain text
#: en/git-push.txt:135
-msgid ""
-"All of the rules described above about what's not allowed as an update can "
-"be overridden by adding an the optional leading `+` to a refspec (or using "
-"`--force` command line option). The only exception to this is that no amount "
-"of forcing will make the `refs/heads/*` namespace accept a non-commit "
-"object. Hooks and configuration can also override or amend these rules, see "
-"e.g. `receive.denyNonFastForwards` in linkgit:git-config[1] and "
-"`pre-receive` and `update` in linkgit:githooks[5]."
+#, priority:220
+msgid "All of the rules described above about what's not allowed as an update can be overridden by adding an the optional leading `+` to a refspec (or using `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object. Hooks and configuration can also override or amend these rules, see e.g. `receive.denyNonFastForwards` in linkgit:git-config[1] and `pre-receive` and `update` in linkgit:githooks[5]."
msgstr ""
#. type: Plain text
#: en/git-push.txt:141
-msgid ""
-"Pushing an empty <src> allows you to delete the <dst> ref from the remote "
-"repository. Deletions are always accepted without a leading `+` in the "
-"refspec (or `--force`), except when forbidden by configuration or hooks. See "
-"`receive.denyDeletes` in linkgit:git-config[1] and `pre-receive` and "
-"`update` in linkgit:githooks[5]."
+#, priority:220
+msgid "Pushing an empty <src> allows you to delete the <dst> ref from the remote repository. Deletions are always accepted without a leading `+` in the refspec (or `--force`), except when forbidden by configuration or hooks. See `receive.denyDeletes` in linkgit:git-config[1] and `pre-receive` and `update` in linkgit:githooks[5]."
msgstr ""
#. type: Plain text
#: en/git-push.txt:146
-msgid ""
-"The special refspec `:` (or `+:` to allow non-fast-forward updates) directs "
-"Git to push \"matching\" branches: for every branch that exists on the local "
-"side, the remote side is updated if a branch of the same name already exists "
-"on the remote side."
+#, priority:220
+msgid "The special refspec `:` (or `+:` to allow non-fast-forward updates) directs Git to push \"matching\" branches: for every branch that exists on the local side, the remote side is updated if a branch of the same name already exists on the remote side."
msgstr ""
#. type: Plain text
#: en/git-push.txt:148
+#, priority:220
msgid "`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`."
msgstr ""
#. type: Plain text
#: en/git-push.txt:152
-msgid ""
-"Push all branches (i.e. refs under `refs/heads/`); cannot be used with other "
-"<refspec>."
+#, priority:220
+msgid "Push all branches (i.e. refs under `refs/heads/`); cannot be used with other <refspec>."
msgstr ""
#. type: Plain text
#: en/git-push.txt:160
-msgid ""
-"Remove remote branches that don't have a local counterpart. For example a "
-"remote branch `tmp` will be removed if a local branch with the same name "
-"doesn't exist any more. This also respects refspecs, e.g. `git push --prune "
-"remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` "
-"will be removed if `refs/heads/foo` doesn't exist."
+#, priority:220
+msgid "Remove remote branches that don't have a local counterpart. For example a remote branch `tmp` will be removed if a local branch with the same name doesn't exist any more. This also respects refspecs, e.g. `git push --prune remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` will be removed if `refs/heads/foo` doesn't exist."
msgstr ""
#. type: Plain text
#: en/git-push.txt:171
-msgid ""
-"Instead of naming each ref to push, specifies that all refs under `refs/` "
-"(which includes but is not limited to `refs/heads/`, `refs/remotes/`, and "
-"`refs/tags/`) be mirrored to the remote repository. Newly created local "
-"refs will be pushed to the remote end, locally updated refs will be force "
-"updated on the remote end, and deleted refs will be removed from the remote "
-"end. This is the default if the configuration option "
-"`remote.<remote>.mirror` is set."
+#, priority:220
+msgid "Instead of naming each ref to push, specifies that all refs under `refs/` (which includes but is not limited to `refs/heads/`, `refs/remotes/`, and `refs/tags/`) be mirrored to the remote repository. Newly created local refs will be pushed to the remote end, locally updated refs will be force updated on the remote end, and deleted refs will be removed from the remote end. This is the default if the configuration option `remote.<remote>.mirror` is set."
msgstr ""
#. type: Plain text
#: en/git-push.txt:180
-msgid ""
-"Produce machine-readable output. The output status line for each ref will "
-"be tab-separated and sent to stdout instead of stderr. The full symbolic "
-"names of the refs will be given."
+#, priority:220
+msgid "Produce machine-readable output. The output status line for each ref will be tab-separated and sent to stdout instead of stderr. The full symbolic names of the refs will be given."
msgstr ""
#. type: Plain text
#: en/git-push.txt:185
-msgid ""
-"All listed refs are deleted from the remote repository. This is the same as "
-"prefixing all refs with a colon."
+#, priority:220
+msgid "All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon."
msgstr ""
#. type: Plain text
#: en/git-push.txt:190
-msgid ""
-"All refs under `refs/tags` are pushed, in addition to refspecs explicitly "
-"listed on the command line."
+#, priority:220
+msgid "All refs under `refs/tags` are pushed, in addition to refspecs explicitly listed on the command line."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:191
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--follow-tags"
msgstr "--follow-tags"
#. type: Plain text
#: en/git-push.txt:198
-msgid ""
-"Push all the refs that would be pushed without this option, and also push "
-"annotated tags in `refs/tags` that are missing from the remote but are "
-"pointing at commit-ish that are reachable from the refs being pushed. This "
-"can also be specified with configuration variable `push.followTags`. For "
-"more information, see `push.followTags` in linkgit:git-config[1]."
+#, priority:220
+msgid "Push all the refs that would be pushed without this option, and also push annotated tags in `refs/tags` that are missing from the remote but are pointing at commit-ish that are reachable from the refs being pushed. This can also be specified with configuration variable `push.followTags`. For more information, see `push.followTags` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:199 en/git-send-pack.txt:73
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--[no-]signed"
msgstr "--[no-]signed"
#. type: Labeled list
#: en/git-push.txt:200 en/git-send-pack.txt:74
-#, no-wrap
+#, no-wrap, priority:220
msgid "--signed=(true|false|if-asked)"
msgstr ""
#. type: Plain text
#: en/git-push.txt:209 en/git-send-pack.txt:83
-msgid ""
-"GPG-sign the push request to update refs on the receiving side, to allow it "
-"to be checked by the hooks and/or be logged. If `false` or `--no-signed`, "
-"no signing will be attempted. If `true` or `--signed`, the push will fail "
-"if the server does not support signed pushes. If set to `if-asked`, sign if "
-"and only if the server supports signed pushes. The push will also fail if "
-"the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for "
-"the details on the receiving end."
+#, priority:220
+msgid "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If `false` or `--no-signed`, no signing will be attempted. If `true` or `--signed`, the push will fail if the server does not support signed pushes. If set to `if-asked`, sign if and only if the server supports signed pushes. The push will also fail if the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for the details on the receiving end."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:210
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--[no-]atomic"
msgstr "--[no-]atomic"
#. type: Plain text
#: en/git-push.txt:214
-msgid ""
-"Use an atomic transaction on the remote side if available. Either all refs "
-"are updated, or on error, no refs are updated. If the server does not "
-"support atomic pushes the push will fail."
+#, priority:220
+msgid "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:216
-#, no-wrap
+#, no-wrap, priority:220
msgid "--push-option=<option>"
msgstr ""
#. type: Plain text
#: en/git-push.txt:226
-msgid ""
-"Transmit the given string to the server, which passes them to the "
-"pre-receive as well as the post-receive hook. The given string must not "
-"contain a NUL or LF character. When multiple `--push-option=<option>` are "
-"given, they are all sent to the other side in the order listed on the "
-"command line. When no `--push-option=<option>` is given from the command "
-"line, the values of configuration variable `push.pushOption` are used "
-"instead."
+#, priority:220
+msgid "Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. When multiple `--push-option=<option>` are given, they are all sent to the other side in the order listed on the command line. When no `--push-option=<option>` is given from the command line, the values of configuration variable `push.pushOption` are used instead."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:227 en/git-send-pack.txt:28
-#, no-wrap
+#, no-wrap, priority:220
msgid "--receive-pack=<git-receive-pack>"
msgstr ""
#. type: Labeled list
#: en/git-push.txt:228 en/git-send-pack.txt:34
-#, no-wrap
+#, no-wrap, priority:220
msgid "--exec=<git-receive-pack>"
msgstr ""
#. type: Plain text
#: en/git-push.txt:233 en/git-send-pack.txt:33
-msgid ""
-"Path to the 'git-receive-pack' program on the remote end. Sometimes useful "
-"when pushing to a remote repository over ssh, and you do not have the "
-"program in a directory on the default $PATH."
+#, priority:220
+msgid "Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:234
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--[no-]force-with-lease"
msgstr "--[no-]force-with-lease"
#. type: Labeled list
#: en/git-push.txt:235
-#, no-wrap
+#, no-wrap, priority:220
msgid "--force-with-lease=<refname>"
msgstr ""
#. type: Labeled list
#: en/git-push.txt:236
-#, no-wrap
+#, no-wrap, priority:220
msgid "--force-with-lease=<refname>:<expect>"
msgstr ""
#. type: Plain text
#: en/git-push.txt:239
-msgid ""
-"Usually, \"git push\" refuses to update a remote ref that is not an ancestor "
-"of the local ref used to overwrite it."
+#, priority:220
+msgid "Usually, \"git push\" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it."
msgstr ""
#. type: Plain text
#: en/git-push.txt:242
-msgid ""
-"This option overrides this restriction if the current value of the remote "
-"ref is the expected value. \"git push\" fails otherwise."
+#, priority:220
+msgid "This option overrides this restriction if the current value of the remote ref is the expected value. \"git push\" fails otherwise."
msgstr ""
#. type: Plain text
#: en/git-push.txt:249
-msgid ""
-"Imagine that you have to rebase what you have already published. You will "
-"have to bypass the \"must fast-forward\" rule in order to replace the "
-"history you originally published with the rebased history. If somebody else "
-"built on top of your original history while you are rebasing, the tip of the "
-"branch at the remote may advance with her commit, and blindly pushing with "
-"`--force` will lose her work."
+#, priority:220
+msgid "Imagine that you have to rebase what you have already published. You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history. If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
msgstr ""
#. type: Plain text
#: en/git-push.txt:256
-msgid ""
-"This option allows you to say that you expect the history you are updating "
-"is what you rebased and want to replace. If the remote ref still points at "
-"the commit you specified, you can be sure that no other people did anything "
-"to the ref. It is like taking a \"lease\" on the ref without explicitly "
-"locking it, and the remote ref is updated only if the \"lease\" is still "
-"valid."
+#, priority:220
+msgid "This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref still points at the commit you specified, you can be sure that no other people did anything to the ref. It is like taking a \"lease\" on the ref without explicitly locking it, and the remote ref is updated only if the \"lease\" is still valid."
msgstr ""
#. type: Plain text
#: en/git-push.txt:261
-msgid ""
-"`--force-with-lease` alone, without specifying the details, will protect all "
-"remote refs that are going to be updated by requiring their current value to "
-"be the same as the remote-tracking branch we have for them."
+#, priority:220
+msgid "`--force-with-lease` alone, without specifying the details, will protect all remote refs that are going to be updated by requiring their current value to be the same as the remote-tracking branch we have for them."
msgstr ""
#. type: Plain text
#: en/git-push.txt:266
-msgid ""
-"`--force-with-lease=<refname>`, without specifying the expected value, will "
-"protect the named ref (alone), if it is going to be updated, by requiring "
-"its current value to be the same as the remote-tracking branch we have for "
-"it."
+#, priority:220
+msgid "`--force-with-lease=<refname>`, without specifying the expected value, will protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the remote-tracking branch we have for it."
msgstr ""
#. type: Plain text
#: en/git-push.txt:274
-msgid ""
-"`--force-with-lease=<refname>:<expect>` will protect the named ref (alone), "
-"if it is going to be updated, by requiring its current value to be the same "
-"as the specified value `<expect>` (which is allowed to be different from the "
-"remote-tracking branch we have for the refname, or we do not even have to "
-"have such a remote-tracking branch when this form is used). If `<expect>` "
-"is the empty string, then the named ref must not already exist."
+#, priority:220
+msgid "`--force-with-lease=<refname>:<expect>` will protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the specified value `<expect>` (which is allowed to be different from the remote-tracking branch we have for the refname, or we do not even have to have such a remote-tracking branch when this form is used). If `<expect>` is the empty string, then the named ref must not already exist."
msgstr ""
#. type: Plain text
#: en/git-push.txt:279
-msgid ""
-"Note that all forms other than `--force-with-lease=<refname>:<expect>` that "
-"specifies the expected current value of the ref explicitly are still "
-"experimental and their semantics may change as we gain experience with this "
-"feature."
+#, priority:220
+msgid "Note that all forms other than `--force-with-lease=<refname>:<expect>` that specifies the expected current value of the ref explicitly are still experimental and their semantics may change as we gain experience with this feature."
msgstr ""
#. type: Plain text
#: en/git-push.txt:282
-msgid ""
-"\"--no-force-with-lease\" will cancel all the previous --force-with-lease on "
-"the command line."
+#, priority:220
+msgid "\"--no-force-with-lease\" will cancel all the previous --force-with-lease on the command line."
msgstr ""
#. type: Plain text
#: en/git-push.txt:288
-msgid ""
-"A general note on safety: supplying this option without an expected value, "
-"i.e. as `--force-with-lease` or `--force-with-lease=<refname>` interacts "
-"very badly with anything that implicitly runs `git fetch` on the remote to "
-"be pushed to in the background, e.g. `git fetch origin` on your repository "
-"in a cronjob."
+#, priority:220
+msgid "A general note on safety: supplying this option without an expected value, i.e. as `--force-with-lease` or `--force-with-lease=<refname>` interacts very badly with anything that implicitly runs `git fetch` on the remote to be pushed to in the background, e.g. `git fetch origin` on your repository in a cronjob."
msgstr ""
#. type: Plain text
#: en/git-push.txt:295
-msgid ""
-"The protection it offers over `--force` is ensuring that subsequent changes "
-"your work wasn't based on aren't clobbered, but this is trivially defeated "
-"if some background process is updating refs in the background. We don't have "
-"anything except the remote tracking info to go by as a heuristic for refs "
-"you're expected to have seen & are willing to clobber."
+#, priority:220
+msgid "The protection it offers over `--force` is ensuring that subsequent changes your work wasn't based on aren't clobbered, but this is trivially defeated if some background process is updating refs in the background. We don't have anything except the remote tracking info to go by as a heuristic for refs you're expected to have seen & are willing to clobber."
msgstr ""
#. type: Plain text
#: en/git-push.txt:299
-msgid ""
-"If your editor or some other system is running `git fetch` in the background "
-"for you a way to mitigate this is to simply set up another remote:"
+#, priority:220
+msgid "If your editor or some other system is running `git fetch` in the background for you a way to mitigate this is to simply set up another remote:"
msgstr ""
#. type: Plain text
#: en/git-push.txt:302
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\tgit remote add origin-push $(git config remote.origin.url)\n"
"\tgit fetch origin-push\n"
@@ -43175,28 +36751,25 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:305
-msgid ""
-"Now when the background process runs `git fetch origin` the references on "
-"`origin-push` won't be updated, and thus commands like:"
+#, priority:220
+msgid "Now when the background process runs `git fetch origin` the references on `origin-push` won't be updated, and thus commands like:"
msgstr ""
#. type: Plain text
#: en/git-push.txt:307
-#, no-wrap
+#, no-wrap, priority:220
msgid "\tgit push --force-with-lease origin-push\n"
msgstr ""
#. type: Plain text
#: en/git-push.txt:312
-msgid ""
-"Will fail unless you manually run `git fetch origin-push`. This method is of "
-"course entirely defeated by something that runs `git fetch --all`, in that "
-"case you'd need to either disable it or do something more tedious like:"
+#, priority:220
+msgid "Will fail unless you manually run `git fetch origin-push`. This method is of course entirely defeated by something that runs `git fetch --all`, in that case you'd need to either disable it or do something more tedious like:"
msgstr ""
#. type: Plain text
#: en/git-push.txt:317
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\tgit fetch # update 'master' from remote\n"
"\tgit tag base master # mark our base point\n"
@@ -43206,300 +36779,247 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:323
-msgid ""
-"I.e. create a `base` tag for versions of the upstream code that you've seen "
-"and are willing to overwrite, then rewrite history, and finally force push "
-"changes to `master` if the remote version is still at `base`, regardless of "
-"what your local `remotes/origin/master` has been updated to in the "
-"background."
+#, priority:220
+msgid "I.e. create a `base` tag for versions of the upstream code that you've seen and are willing to overwrite, then rewrite history, and finally force push changes to `master` if the remote version is still at `base`, regardless of what your local `remotes/origin/master` has been updated to in the background."
msgstr ""
#. type: Plain text
#: en/git-push.txt:331
-msgid ""
-"Usually, the command refuses to update a remote ref that is not an ancestor "
-"of the local ref used to overwrite it. Also, when `--force-with-lease` "
-"option is used, the command refuses to update a remote ref whose current "
-"value does not match what is expected."
+#, priority:220
+msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Also, when `--force-with-lease` option is used, the command refuses to update a remote ref whose current value does not match what is expected."
msgstr ""
#. type: Plain text
#: en/git-push.txt:334
-msgid ""
-"This flag disables these checks, and can cause the remote repository to lose "
-"commits; use it with care."
+#, priority:220
+msgid "This flag disables these checks, and can cause the remote repository to lose commits; use it with care."
msgstr ""
#. type: Plain text
#: en/git-push.txt:343
-msgid ""
-"Note that `--force` applies to all the refs that are pushed, hence using it "
-"with `push.default` set to `matching` or with multiple push destinations "
-"configured with `remote.*.push` may overwrite refs other than the current "
-"branch (including local refs that are strictly behind their remote "
-"counterpart). To force a push to only one branch, use a `+` in front of the "
-"refspec to push (e.g `git push origin +master` to force a push to the "
-"`master` branch). See the `<refspec>...` section above for details."
+#, ignore-ellipsis, priority:220
+msgid "Note that `--force` applies to all the refs that are pushed, hence using it with `push.default` set to `matching` or with multiple push destinations configured with `remote.*.push` may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart). To force a push to only one branch, use a `+` in front of the refspec to push (e.g `git push origin +master` to force a push to the `master` branch). See the `<refspec>...` section above for details."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:344
-#, no-wrap
+#, no-wrap, priority:220
msgid "--repo=<repository>"
msgstr ""
#. type: Plain text
#: en/git-push.txt:347
-msgid ""
-"This option is equivalent to the <repository> argument. If both are "
-"specified, the command-line argument takes precedence."
+#, priority:220
+msgid "This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence."
msgstr ""
#. type: Plain text
#: en/git-push.txt:354
-msgid ""
-"For every branch that is up to date or successfully pushed, add upstream "
-"(tracking) reference, used by argument-less linkgit:git-pull[1] and other "
-"commands. For more information, see `branch.<name>.merge` in "
-"linkgit:git-config[1]."
+#, priority:220
+msgid "For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:355
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--[no-]thin"
msgstr "--[no-]thin"
#. type: Plain text
#: en/git-push.txt:360
-msgid ""
-"These options are passed to linkgit:git-send-pack[1]. A thin transfer "
-"significantly reduces the amount of sent data when the sender and receiver "
-"share many of the same objects in common. The default is `--thin`."
+#, priority:220
+msgid "These options are passed to linkgit:git-send-pack[1]. A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is `--thin`."
msgstr ""
#. type: Plain text
#: en/git-push.txt:366
-msgid ""
-"Suppress all output, including the listing of updated refs, unless an error "
-"occurs. Progress is not reported to the standard error stream."
+#, priority:220
+msgid "Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:378
-#, no-wrap
+#, no-wrap, priority:220
msgid "--recurse-submodules=check|on-demand|only|no"
msgstr ""
#. type: Plain text
#: en/git-push.txt:392
-msgid ""
-"May be used to make sure all submodule commits used by the revisions to be "
-"pushed are available on a remote-tracking branch. If 'check' is used Git "
-"will verify that all submodule commits that changed in the revisions to be "
-"pushed are available on at least one remote of the submodule. If any commits "
-"are missing the push will be aborted and exit with non-zero status. If "
-"'on-demand' is used all submodules that changed in the revisions to be "
-"pushed will be pushed. If on-demand was not able to push all necessary "
-"revisions it will also be aborted and exit with non-zero status. If 'only' "
-"is used all submodules will be recursively pushed while the superproject is "
-"left unpushed. A value of 'no' or using `--no-recurse-submodules` can be "
-"used to override the push.recurseSubmodules configuration variable when no "
-"submodule recursion is required."
+#, priority:220
+msgid "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If 'check' is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If 'on-demand' is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If 'only' is used all submodules will be recursively pushed while the superproject is left unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:393
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--[no-]verify"
msgstr "--[no-]verify"
#. type: Plain text
#: en/git-push.txt:397
-msgid ""
-"Toggle the pre-push hook (see linkgit:githooks[5]). The default is "
-"--verify, giving the hook a chance to prevent the push. With --no-verify, "
-"the hook is bypassed completely."
+#, priority:220
+msgid "Toggle the pre-push hook (see linkgit:githooks[5]). The default is --verify, giving the hook a chance to prevent the push. With --no-verify, the hook is bypassed completely."
msgstr ""
#. type: Plain text
#: en/git-push.txt:414
-msgid ""
-"The output of \"git push\" depends on the transport method used; this "
-"section describes the output when pushing over the Git protocol (either "
-"locally or via ssh)."
+#, priority:220
+msgid "The output of \"git push\" depends on the transport method used; this section describes the output when pushing over the Git protocol (either locally or via ssh)."
msgstr ""
#. type: Plain text
#: en/git-push.txt:417
-msgid ""
-"The status of the push is output in tabular form, with each line "
-"representing the status of a single ref. Each line is of the form:"
+#, priority:220
+msgid "The status of the push is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
#. type: delimited block -
#: en/git-push.txt:420
-#, no-wrap
+#, no-wrap, priority:220
msgid " <flag> <summary> <from> -> <to> (<reason>)\n"
msgstr ""
#. type: Plain text
#: en/git-push.txt:423
+#, priority:220
msgid "If --porcelain is used, then each line of the output is of the form:"
msgstr ""
#. type: delimited block -
#: en/git-push.txt:426
-#, no-wrap
+#, no-wrap, priority:220
msgid " <flag> \\t <from>:<to> \\t <summary> (<reason>)\n"
msgstr ""
#. type: Plain text
#: en/git-push.txt:430
-msgid ""
-"The status of up-to-date refs is shown only if --porcelain or --verbose "
-"option is used."
+#, priority:220
+msgid "The status of up-to-date refs is shown only if --porcelain or --verbose option is used."
msgstr ""
#. type: Plain text
#: en/git-push.txt:434
+#, priority:220
msgid "for a successfully pushed fast-forward;"
msgstr ""
#. type: Plain text
#: en/git-push.txt:436
+#, priority:220
msgid "for a successfully deleted ref;"
msgstr ""
#. type: Plain text
#: en/git-push.txt:437
+#, priority:220
msgid "for a successfully pushed new ref;"
msgstr ""
#. type: Plain text
#: en/git-push.txt:438
+#, priority:220
msgid "for a ref that was rejected or failed to push; and"
msgstr ""
#. type: Plain text
#: en/git-push.txt:439
+#, priority:220
msgid "for a ref that was up to date and did not need pushing."
msgstr ""
#. type: Plain text
#: en/git-push.txt:445
-msgid ""
-"For a successfully pushed ref, the summary shows the old and new values of "
-"the ref in a form suitable for using as an argument to `git log` (this is "
-"`<old>..<new>` in most cases, and `<old>...<new>` for forced "
-"non-fast-forward updates)."
+#, ignore-ellipsis, priority:220
+msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
#. type: Plain text
#: en/git-push.txt:447
+#, priority:220
msgid "For a failed update, more details are given:"
msgstr ""
#. type: Labeled list
#: en/git-push.txt:449
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "rejected"
msgstr "[rechazado]"
#. type: Plain text
#: en/git-push.txt:452
-msgid ""
-"Git did not try to send the ref at all, typically because it is not a "
-"fast-forward and you did not force the update."
+#, priority:220
+msgid "Git did not try to send the ref at all, typically because it is not a fast-forward and you did not force the update."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:453
-#, no-wrap
+#, no-wrap, priority:220
msgid "remote rejected"
msgstr ""
#. type: Plain text
#: en/git-push.txt:461
-msgid ""
-"The remote end refused the update. Usually caused by a hook on the remote "
-"side, or because the remote repository has one of the following safety "
-"options in effect: `receive.denyCurrentBranch` (for pushes to the checked "
-"out branch), `receive.denyNonFastForwards` (for forced non-fast-forward "
-"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See "
-"linkgit:git-config[1]."
+#, priority:220
+msgid "The remote end refused the update. Usually caused by a hook on the remote side, or because the remote repository has one of the following safety options in effect: `receive.denyCurrentBranch` (for pushes to the checked out branch), `receive.denyNonFastForwards` (for forced non-fast-forward updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:462
-#, no-wrap
+#, no-wrap, priority:220
msgid "remote failure"
msgstr ""
#. type: Plain text
#: en/git-push.txt:466
-msgid ""
-"The remote end did not report the successful update of the ref, perhaps "
-"because of a temporary error on the remote side, a break in the network "
-"connection, or other transient error."
+#, priority:220
+msgid "The remote end did not report the successful update of the ref, perhaps because of a temporary error on the remote side, a break in the network connection, or other transient error."
msgstr ""
#. type: Plain text
#: en/git-push.txt:472
-msgid ""
-"The name of the local ref being pushed, minus its `refs/<type>/` prefix. In "
-"the case of deletion, the name of the local ref is omitted."
+#, priority:220
+msgid "The name of the local ref being pushed, minus its `refs/<type>/` prefix. In the case of deletion, the name of the local ref is omitted."
msgstr ""
#. type: Plain text
#: en/git-push.txt:476
+#, priority:220
msgid "The name of the remote ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
#. type: Plain text
#: en/git-push.txt:481
-msgid ""
-"A human-readable explanation. In the case of successfully pushed refs, no "
-"explanation is needed. For a failed ref, the reason for failure is "
-"described."
+#, priority:220
+msgid "A human-readable explanation. In the case of successfully pushed refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Title -
#: en/git-push.txt:483
-#, no-wrap
+#, no-wrap, priority:220
msgid "NOTE ABOUT FAST-FORWARDS"
msgstr ""
#. type: Plain text
#: en/git-push.txt:488
-msgid ""
-"When an update changes a branch (or more in general, a ref) that used to "
-"point at commit A to point at another commit B, it is called a fast-forward "
-"update if and only if B is a descendant of A."
+#, priority:220
+msgid "When an update changes a branch (or more in general, a ref) that used to point at commit A to point at another commit B, it is called a fast-forward update if and only if B is a descendant of A."
msgstr ""
#. type: Plain text
#: en/git-push.txt:492
-msgid ""
-"In a fast-forward update from A to B, the set of commits that the original "
-"commit A built on top of is a subset of the commits the new commit B builds "
-"on top of. Hence, it does not lose any history."
+#, priority:220
+msgid "In a fast-forward update from A to B, the set of commits that the original commit A built on top of is a subset of the commits the new commit B builds on top of. Hence, it does not lose any history."
msgstr ""
#. type: Plain text
#: en/git-push.txt:497
-msgid ""
-"In contrast, a non-fast-forward update will lose history. For example, "
-"suppose you and somebody else started at the same commit X, and you built a "
-"history leading to commit B while the other person built a history leading "
-"to commit A. The history looks like this:"
+#, priority:220
+msgid "In contrast, a non-fast-forward update will lose history. For example, suppose you and somebody else started at the same commit X, and you built a history leading to commit B while the other person built a history leading to commit A. The history looks like this:"
msgstr ""
#. type: delimited block -
#: en/git-push.txt:503
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
" B\n"
" /\n"
@@ -43508,55 +37028,43 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:509
-msgid ""
-"Further suppose that the other person already pushed changes leading to A "
-"back to the original repository from which you two obtained the original "
-"commit X."
+#, priority:220
+msgid "Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X."
msgstr ""
#. type: Plain text
#: en/git-push.txt:512
-msgid ""
-"The push done by the other person updated the branch that used to point at "
-"commit X to point at commit A. It is a fast-forward."
+#, priority:220
+msgid "The push done by the other person updated the branch that used to point at commit X to point at commit A. It is a fast-forward."
msgstr ""
#. type: Plain text
#: en/git-push.txt:517
-msgid ""
-"But if you try to push, you will attempt to update the branch (that now "
-"points at A) with commit B. This does _not_ fast-forward. If you did so, "
-"the changes introduced by commit A will be lost, because everybody will now "
-"start building on top of B."
+#, priority:220
+msgid "But if you try to push, you will attempt to update the branch (that now points at A) with commit B. This does _not_ fast-forward. If you did so, the changes introduced by commit A will be lost, because everybody will now start building on top of B."
msgstr ""
#. type: Plain text
#: en/git-push.txt:520
-msgid ""
-"The command by default does not allow an update that is not a fast-forward "
-"to prevent such loss of history."
+#, priority:220
+msgid "The command by default does not allow an update that is not a fast-forward to prevent such loss of history."
msgstr ""
#. type: Plain text
#: en/git-push.txt:525
-msgid ""
-"If you do not want to lose your work (history from X to B) or the work by "
-"the other person (history from X to A), you would need to first fetch the "
-"history from the repository, create a history that contains changes done by "
-"both parties, and push the result back."
+#, priority:220
+msgid "If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back."
msgstr ""
#. type: Plain text
#: en/git-push.txt:529
-msgid ""
-"You can perform \"git pull\", resolve potential conflicts, and \"git push\" "
-"the result. A \"git pull\" will create a merge commit C between commits A "
-"and B."
+#, priority:220
+msgid "You can perform \"git pull\", resolve potential conflicts, and \"git push\" the result. A \"git pull\" will create a merge commit C between commits A and B."
msgstr ""
#. type: delimited block -
#: en/git-push.txt:535
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
" B---C\n"
" / /\n"
@@ -43565,22 +37073,19 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:540
-msgid ""
-"Updating A with the resulting merge commit will fast-forward and your push "
-"will be accepted."
+#, priority:220
+msgid "Updating A with the resulting merge commit will fast-forward and your push will be accepted."
msgstr ""
#. type: Plain text
#: en/git-push.txt:545
-msgid ""
-"Alternatively, you can rebase your change between X and B on top of A, with "
-"\"git pull --rebase\", and push the result back. The rebase will create a "
-"new commit D that builds the change between X and B on top of A."
+#, priority:220
+msgid "Alternatively, you can rebase your change between X and B on top of A, with \"git pull --rebase\", and push the result back. The rebase will create a new commit D that builds the change between X and B on top of A."
msgstr ""
#. type: delimited block -
#: en/git-push.txt:551
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
" B D\n"
" / /\n"
@@ -43589,211 +37094,169 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:556
-msgid ""
-"Again, updating A with this commit will fast-forward and your push will be "
-"accepted."
+#, priority:220
+msgid "Again, updating A with this commit will fast-forward and your push will be accepted."
msgstr ""
#. type: Plain text
#: en/git-push.txt:567
-msgid ""
-"There is another common situation where you may encounter non-fast-forward "
-"rejection when you try to push, and it is possible even when you are pushing "
-"into a repository nobody else pushes into. After you push commit A yourself "
-"(in the first picture in this section), replace it with \"git commit "
-"--amend\" to produce commit B, and you try to push it out, because forgot "
-"that you have pushed A out already. In such a case, and only if you are "
-"certain that nobody in the meantime fetched your earlier commit A (and "
-"started building on top of it), you can run \"git push --force\" to "
-"overwrite it. In other words, \"git push --force\" is a method reserved for "
-"a case where you do mean to lose history."
+#, priority:220
+msgid "There is another common situation where you may encounter non-fast-forward rejection when you try to push, and it is possible even when you are pushing into a repository nobody else pushes into. After you push commit A yourself (in the first picture in this section), replace it with \"git commit --amend\" to produce commit B, and you try to push it out, because forgot that you have pushed A out already. In such a case, and only if you are certain that nobody in the meantime fetched your earlier commit A (and started building on top of it), you can run \"git push --force\" to overwrite it. In other words, \"git push --force\" is a method reserved for a case where you do mean to lose history."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:572
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:576
-msgid ""
-"Works like `git push <remote>`, where <remote> is the current branch's "
-"remote (or `origin`, if no remote is configured for the current branch)."
+#, priority:220
+msgid "Works like `git push <remote>`, where <remote> is the current branch's remote (or `origin`, if no remote is configured for the current branch)."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:577
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push origin`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:582
-msgid ""
-"Without additional configuration, pushes the current branch to the "
-"configured upstream (`remote.origin.merge` configuration variable) if it has "
-"the same name as the current branch, and errors out without pushing "
-"otherwise."
+#, priority:220
+msgid "Without additional configuration, pushes the current branch to the configured upstream (`remote.origin.merge` configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise."
msgstr ""
#. type: Plain text
#: en/git-push.txt:586
-msgid ""
-"The default behavior of this command when no <refspec> is given can be "
-"configured by setting the `push` option of the remote, or the `push.default` "
-"configuration variable."
+#, priority:220
+msgid "The default behavior of this command when no <refspec> is given can be configured by setting the `push` option of the remote, or the `push.default` configuration variable."
msgstr ""
#. type: Plain text
#: en/git-push.txt:591
-msgid ""
-"For example, to default to pushing only the current branch to `origin` use "
-"`git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in "
-"the examples below) can be configured as the default for `git push origin`."
+#, priority:220
+msgid "For example, to default to pushing only the current branch to `origin` use `git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in the examples below) can be configured as the default for `git push origin`."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:592
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push origin :`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:596
-msgid ""
-"Push \"matching\" branches to `origin`. See <refspec> in the "
-"<<OPTIONS,OPTIONS>> section above for a description of \"matching\" "
-"branches."
+#, priority:220
+msgid "Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,OPTIONS>> section above for a description of \"matching\" branches."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:597
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push origin master`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:603
-msgid ""
-"Find a ref that matches `master` in the source repository (most likely, it "
-"would find `refs/heads/master`), and update the same ref "
-"(e.g. `refs/heads/master`) in `origin` repository with it. If `master` did "
-"not exist remotely, it would be created."
+#, priority:220
+msgid "Find a ref that matches `master` in the source repository (most likely, it would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/master`) in `origin` repository with it. If `master` did not exist remotely, it would be created."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:604
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push origin HEAD`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:607
+#, priority:220
msgid "A handy way to push the current branch to the same name on the remote."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:608
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push mothership master:satellite/master dev:satellite/dev`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:613
-msgid ""
-"Use the source ref that matches `master` (e.g. `refs/heads/master`) to "
-"update the ref that matches `satellite/master` (most probably "
-"`refs/remotes/satellite/master`) in the `mothership` repository; do the same "
-"for `dev` and `satellite/dev`."
+#, priority:220
+msgid "Use the source ref that matches `master` (e.g. `refs/heads/master`) to update the ref that matches `satellite/master` (most probably `refs/remotes/satellite/master`) in the `mothership` repository; do the same for `dev` and `satellite/dev`."
msgstr ""
#. type: Plain text
#: en/git-push.txt:616
-msgid ""
-"See the section describing `<refspec>...` above for a discussion of the "
-"matching semantics."
+#, ignore-ellipsis, priority:220
+msgid "See the section describing `<refspec>...` above for a discussion of the matching semantics."
msgstr ""
#. type: Plain text
#: en/git-push.txt:623
-msgid ""
-"This is to emulate `git fetch` run on the `mothership` using `git push` that "
-"is run in the opposite direction in order to integrate the work done on "
-"`satellite`, and is often necessary when you can only make connection in one "
-"way (i.e. satellite can ssh into mothership but mothership cannot initiate "
-"connection to satellite because the latter is behind a firewall or does not "
-"run sshd)."
+#, priority:220
+msgid "This is to emulate `git fetch` run on the `mothership` using `git push` that is run in the opposite direction in order to integrate the work done on `satellite`, and is often necessary when you can only make connection in one way (i.e. satellite can ssh into mothership but mothership cannot initiate connection to satellite because the latter is behind a firewall or does not run sshd)."
msgstr ""
#. type: Plain text
#: en/git-push.txt:628
-msgid ""
-"After running this `git push` on the `satellite` machine, you would ssh into "
-"the `mothership` and run `git merge` there to complete the emulation of `git "
-"pull` that were run on `mothership` to pull changes made on `satellite`."
+#, priority:220
+msgid "After running this `git push` on the `satellite` machine, you would ssh into the `mothership` and run `git merge` there to complete the emulation of `git pull` that were run on `mothership` to pull changes made on `satellite`."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:629
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push origin HEAD:master`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:633
-msgid ""
-"Push the current branch to the remote ref matching `master` in the `origin` "
-"repository. This form is convenient to push the current branch without "
-"thinking about its local name."
+#, priority:220
+msgid "Push the current branch to the remote ref matching `master` in the `origin` repository. This form is convenient to push the current branch without thinking about its local name."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:634
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push origin master:refs/heads/experimental`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:640
-msgid ""
-"Create the branch `experimental` in the `origin` repository by copying the "
-"current `master` branch. This form is only needed to create a new branch or "
-"tag in the remote repository when the local name and the remote name are "
-"different; otherwise, the ref name on its own will work."
+#, priority:220
+msgid "Create the branch `experimental` in the `origin` repository by copying the current `master` branch. This form is only needed to create a new branch or tag in the remote repository when the local name and the remote name are different; otherwise, the ref name on its own will work."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:641
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push origin :experimental`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:644
-msgid ""
-"Find a ref that matches `experimental` in the `origin` repository "
-"(e.g. `refs/heads/experimental`), and delete it."
+#, priority:220
+msgid "Find a ref that matches `experimental` in the `origin` repository (e.g. `refs/heads/experimental`), and delete it."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:645
-#, no-wrap
+#, no-wrap, priority:220
msgid "`git push origin +dev:master`"
msgstr ""
#. type: Plain text
#: en/git-push.txt:650
-msgid ""
-"Update the origin repository's master branch with the dev branch, allowing "
-"non-fast-forward updates. *This can leave unreferenced commits dangling in "
-"the origin repository.* Consider the following situation, where a "
-"fast-forward is not possible:"
+#, priority:220
+msgid "Update the origin repository's master branch with the dev branch, allowing non-fast-forward updates. *This can leave unreferenced commits dangling in the origin repository.* Consider the following situation, where a fast-forward is not possible:"
msgstr ""
#. type: delimited block -
#: en/git-push.txt:655
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\t o---o---o---A---B origin/master\n"
"\t\t \\\n"
@@ -43802,12 +37265,13 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:658
+#, priority:220
msgid "The above command would change the origin repository to"
msgstr ""
#. type: delimited block -
#: en/git-push.txt:663
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\t\t A---B (unnamed branch)\n"
"\t\t /\n"
@@ -43816,27 +37280,25 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:668
-msgid ""
-"Commits A and B would no longer belong to a branch with a symbolic name, and "
-"so would be unreachable. As such, these commits would be removed by a `git "
-"gc` command on the origin repository."
+#, priority:220
+msgid "Commits A and B would no longer belong to a branch with a symbolic name, and so would be unreachable. As such, these commits would be removed by a `git gc` command on the origin repository."
msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-quiltimport(1)"
msgstr "git-quiltimport(1)"
#. type: Plain text
#: en/git-quiltimport.txt:7
+#, priority:100
msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]\n"
"\t\t[--series <file>] [--keep-non-patch]\n"
@@ -43844,436 +37306,366 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:21
-msgid ""
-"Applies a quilt patchset onto the current Git branch, preserving the patch "
-"boundaries, patch order, and patch descriptions present in the quilt "
-"patchset."
+#, priority:100
+msgid "Applies a quilt patchset onto the current Git branch, preserving the patch boundaries, patch order, and patch descriptions present in the quilt patchset."
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:27
-msgid ""
-"For each patch the code attempts to extract the author from the patch "
-"description. If that fails it falls back to the author specified with "
-"--author. If the --author flag was not given the patch description is "
-"displayed and the user is asked to interactively enter the author of the "
-"patch."
+#, priority:100
+msgid "For each patch the code attempts to extract the author from the patch description. If that fails it falls back to the author specified with --author. If the --author flag was not given the patch description is displayed and the user is asked to interactively enter the author of the patch."
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:30
-msgid ""
-"If a subject is not found in the patch description the patch name is "
-"preserved as the 1 line subject in the Git description."
+#, priority:100
+msgid "If a subject is not found in the patch description the patch name is preserved as the 1 line subject in the Git description."
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:40
-msgid ""
-"Walk through the patches in the series and warn if we cannot find all of the "
-"necessary information to commit a patch. At the time of this writing only "
-"missing author information is warned about."
+#, priority:100
+msgid "Walk through the patches in the series and warn if we cannot find all of the necessary information to commit a patch. At the time of this writing only missing author information is warned about."
msgstr ""
#. type: Labeled list
#: en/git-quiltimport.txt:41
-#, no-wrap
+#, no-wrap, priority:100
msgid "--author Author Name <Author Email>"
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:44
-msgid ""
-"The author name and email address to use when no author information can be "
-"found in the patch description."
+#, priority:100
+msgid "The author name and email address to use when no author information can be found in the patch description."
msgstr ""
#. type: Labeled list
#: en/git-quiltimport.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "--patches <dir>"
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:47
+#, priority:100
msgid "The directory to find the quilt patches."
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:51
-msgid ""
-"The default for the patch directory is patches or the value of the "
-"`$QUILT_PATCHES` environment variable."
+#, priority:100
+msgid "The default for the patch directory is patches or the value of the `$QUILT_PATCHES` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-quiltimport.txt:52
-#, no-wrap
+#, no-wrap, priority:100
msgid "--series <file>"
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:54
+#, priority:100
msgid "The quilt series file."
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:58
-msgid ""
-"The default for the series file is <patches>/series or the value of the "
-"`$QUILT_SERIES` environment variable."
+#, priority:100
+msgid "The default for the series file is <patches>/series or the value of the `$QUILT_SERIES` environment variable."
msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-read-tree(1)"
msgstr "git-read-tree(1)"
#. type: Plain text
#: en/git-read-tree.txt:7
+#, priority:100
msgid "git-read-tree - Reads tree information into the index"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:16
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid ""
-"'git read-tree' [[-m [--trivial] [--aggressive] | --reset | "
-"--prefix=<prefix>]\n"
+"'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]\n"
"\t\t[-u [--exclude-per-directory=<gitignore>] | -i]]\n"
"\t\t[--index-output=<file>] [--no-sparse-checkout]\n"
"\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
-msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefijo>)"
-" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
-"[--index-output=<archivo>] (--empty | <찼rbol-ismo1> [<찼rbol-ismo2> [<찼rbol-"
-"ismo3>]])"
+msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<archivo>] (--empty | <찼rbol-ismo1> [<찼rbol-ismo2> [<찼rbol-ismo3>]])"
#. type: Plain text
#: en/git-read-tree.txt:23
-msgid ""
-"Reads the tree information given by <tree-ish> into the index, but does not "
-"actually *update* any of the files it \"caches\". (see: "
-"linkgit:git-checkout-index[1])"
+#, priority:100
+msgid "Reads the tree information given by <tree-ish> into the index, but does not actually *update* any of the files it \"caches\". (see: linkgit:git-checkout-index[1])"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:28
-msgid ""
-"Optionally, it can merge a tree into the index, perform a fast-forward "
-"(i.e. 2-way) merge, or a 3-way merge, with the `-m` flag. When used with "
-"`-m`, the `-u` flag causes it to also update the files in the work tree with "
-"the result of the merge."
+#, priority:100
+msgid "Optionally, it can merge a tree into the index, perform a fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m` flag. When used with `-m`, the `-u` flag causes it to also update the files in the work tree with the result of the merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:31
-msgid ""
-"Trivial merges are done by 'git read-tree' itself. Only conflicting paths "
-"will be in unmerged state when 'git read-tree' returns."
+#, priority:100
+msgid "Trivial merges are done by 'git read-tree' itself. Only conflicting paths will be in unmerged state when 'git read-tree' returns."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:39
-msgid ""
-"Perform a merge, not just a read. The command will refuse to run if your "
-"index file has unmerged entries, indicating that you have not finished "
-"previous merge you started."
+#, priority:100
+msgid "Perform a merge, not just a read. The command will refuse to run if your index file has unmerged entries, indicating that you have not finished previous merge you started."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--reset"
msgstr "--reset"
#. type: Plain text
#: en/git-read-tree.txt:44
-msgid ""
-"Same as -m, except that unmerged entries are discarded instead of "
-"failing. When used with `-u`, updates leading to loss of working tree "
-"changes will not abort the operation."
+#, priority:100
+msgid "Same as -m, except that unmerged entries are discarded instead of failing. When used with `-u`, updates leading to loss of working tree changes will not abort the operation."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:48
-msgid ""
-"After a successful merge, update the files in the work tree with the result "
-"of the merge."
+#, priority:100
+msgid "After a successful merge, update the files in the work tree with the result of the merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:57
-msgid ""
-"Usually a merge requires the index file as well as the files in the working "
-"tree to be up to date with the current head commit, in order not to lose "
-"local changes. This flag disables the check with the working tree and is "
-"meant to be used when creating a merge of trees that are not directly "
-"related to the current working tree status into a temporary index file."
+#, priority:100
+msgid "Usually a merge requires the index file as well as the files in the working tree to be up to date with the current head commit, in order not to lose local changes. This flag disables the check with the working tree and is meant to be used when creating a merge of trees that are not directly related to the current working tree status into a temporary index file."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:62
-msgid ""
-"Check if the command would error out, without updating the index or the "
-"files in the working tree for real."
+#, priority:100
+msgid "Check if the command would error out, without updating the index or the files in the working tree for real."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:65
+#, priority:100
msgid "Show the progress of checking files out."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:66
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--trivial"
msgstr "--trivial"
#. type: Plain text
#: en/git-read-tree.txt:71
-msgid ""
-"Restrict three-way merge by 'git read-tree' to happen only if there is no "
-"file-level merging required, instead of resolving merge for trivial cases "
-"and leaving conflicting files unresolved in the index."
+#, priority:100
+msgid "Restrict three-way merge by 'git read-tree' to happen only if there is no file-level merging required, instead of resolving merge for trivial cases and leaving conflicting files unresolved in the index."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:78
-msgid ""
-"Usually a three-way merge by 'git read-tree' resolves the merge for really "
-"trivial cases and leaves other cases unresolved in the index, so that "
-"porcelains can implement different merge policies. This flag makes the "
-"command resolve a few more cases internally:"
+#, priority:100
+msgid "Usually a three-way merge by 'git read-tree' resolves the merge for really trivial cases and leaves other cases unresolved in the index, so that porcelains can implement different merge policies. This flag makes the command resolve a few more cases internally:"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:81
-msgid ""
-"when one side removes a path and the other side leaves the path unmodified. "
-"The resolution is to remove that path."
+#, priority:100
+msgid "when one side removes a path and the other side leaves the path unmodified. The resolution is to remove that path."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:82
+#, priority:100
msgid "when both sides remove a path. The resolution is to remove that path."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:84
+#, priority:100
msgid "when both sides add a path identically. The resolution is to add that path."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:85 en/git-svn.txt:75
-#, no-wrap
+#, no-wrap, priority:100
msgid "--prefix=<prefix>"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:90
-msgid ""
-"Keep the current index contents, and read the contents of the named tree-ish "
-"under the directory at `<prefix>`. The command will refuse to overwrite "
-"entries that already existed in the original index file."
+#, priority:100
+msgid "Keep the current index contents, and read the contents of the named tree-ish under the directory at `<prefix>`. The command will refuse to overwrite entries that already existed in the original index file."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:91
-#, no-wrap
+#, no-wrap, priority:100
msgid "--exclude-per-directory=<gitignore>"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:105
-msgid ""
-"When running the command with `-u` and `-m` options, the merge result may "
-"need to overwrite paths that are not tracked in the current branch. The "
-"command usually refuses to proceed with the merge to avoid losing such a "
-"path. However this safety valve sometimes gets in the way. For example, it "
-"often happens that the other branch added a file that used to be a generated "
-"file in your branch, and the safety valve triggers when you try to switch to "
-"that branch after you ran `make` but before running `make clean` to remove "
-"the generated file. This option tells the command to read per-directory "
-"exclude file (usually '.gitignore') and allows such an untracked but "
-"explicitly ignored file to be overwritten."
+#, priority:100
+msgid "When running the command with `-u` and `-m` options, the merge result may need to overwrite paths that are not tracked in the current branch. The command usually refuses to proceed with the merge to avoid losing such a path. However this safety valve sometimes gets in the way. For example, it often happens that the other branch added a file that used to be a generated file in your branch, and the safety valve triggers when you try to switch to that branch after you ran `make` but before running `make clean` to remove the generated file. This option tells the command to read per-directory exclude file (usually '.gitignore') and allows such an untracked but explicitly ignored file to be overwritten."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:106
-#, no-wrap
+#, no-wrap, priority:100
msgid "--index-output=<file>"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:117
-msgid ""
-"Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting "
-"index in the named file. While the command is operating, the original index "
-"file is locked with the same mechanism as usual. The file must allow to be "
-"rename(2)ed into from a temporary file that is created next to the usual "
-"index file; typically this means it needs to be on the same filesystem as "
-"the index file itself, and you need write permission to the directories the "
-"index file and index output file are located in."
+#, priority:100
+msgid "Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting index in the named file. While the command is operating, the original index file is locked with the same mechanism as usual. The file must allow to be rename(2)ed into from a temporary file that is created next to the usual index file; typically this means it needs to be on the same filesystem as the index file itself, and you need write permission to the directories the index file and index output file are located in."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]recurse-submodules"
msgstr "--[no-]recurse-submodules"
#. type: Plain text
#: en/git-read-tree.txt:123
-msgid ""
-"Using --recurse-submodules will update the content of all initialized "
-"submodules according to the commit recorded in the superproject by calling "
-"read-tree recursively, also setting the submodules HEAD to be detached at "
-"that commit."
+#, priority:100
+msgid "Using --recurse-submodules will update the content of all initialized submodules according to the commit recorded in the superproject by calling read-tree recursively, also setting the submodules HEAD to be detached at that commit."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:124
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
#. type: Plain text
#: en/git-read-tree.txt:127
+#, priority:100
msgid "Disable sparse checkout support even if `core.sparseCheckout` is true."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:128
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--empty"
msgstr "--empty"
#. type: Plain text
#: en/git-read-tree.txt:131
+#, priority:100
msgid "Instead of reading tree object(s) into the index, just empty it."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:136
-#, no-wrap
+#, no-wrap, priority:100
msgid "<tree-ish#>"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:138
+#, priority:100
msgid "The id of the tree object(s) to be read/merged."
msgstr ""
#. type: Title -
#: en/git-read-tree.txt:141
-#, no-wrap
+#, no-wrap, priority:100
msgid "MERGING"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:146
-msgid ""
-"If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single "
-"tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a "
-"3-way merge if 3 or more trees are provided."
+#, priority:100
+msgid "If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a 3-way merge if 3 or more trees are provided."
msgstr ""
#. type: Title ~
#: en/git-read-tree.txt:149
-#, no-wrap
+#, no-wrap, priority:100
msgid "Single Tree Merge"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:155
-msgid ""
-"If only 1 tree is specified, 'git read-tree' operates as if the user did not "
-"specify `-m`, except that if the original index has an entry for a given "
-"pathname, and the contents of the path match with the tree being read, the "
-"stat info from the index is used. (In other words, the index's stat()s take "
-"precedence over the merged tree's)."
+#, priority:100
+msgid "If only 1 tree is specified, 'git read-tree' operates as if the user did not specify `-m`, except that if the original index has an entry for a given pathname, and the contents of the path match with the tree being read, the stat info from the index is used. (In other words, the index's stat()s take precedence over the merged tree's)."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:159
-msgid ""
-"That means that if you do a `git read-tree -m <newtree>` followed by a `git "
-"checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff "
-"that really changed."
+#, priority:100
+msgid "That means that if you do a `git read-tree -m <newtree>` followed by a `git checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff that really changed."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:162
-msgid ""
-"This is used to avoid unnecessary false hits when 'git diff-files' is run "
-"after 'git read-tree'."
+#, priority:100
+msgid "This is used to avoid unnecessary false hits when 'git diff-files' is run after 'git read-tree'."
msgstr ""
#. type: Title ~
#: en/git-read-tree.txt:165
-#, no-wrap
+#, no-wrap, priority:100
msgid "Two Tree Merge"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:171
-msgid ""
-"Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head "
-"commit of the current repository, and $M is the head of a foreign tree, "
-"which is simply ahead of $H (i.e. we are in a fast-forward situation)."
+#, priority:100
+msgid "Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head commit of the current repository, and $M is the head of a foreign tree, which is simply ahead of $H (i.e. we are in a fast-forward situation)."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:174
-msgid ""
-"When two trees are specified, the user is telling 'git read-tree' the "
-"following:"
+#, priority:100
+msgid "When two trees are specified, the user is telling 'git read-tree' the following:"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:176
+#, priority:100
msgid "The current index and work tree is derived from $H, but"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:177
+#, priority:100
msgid "the user may have local changes in them since $H."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:179
+#, priority:100
msgid "The user wants to fast-forward to $M."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:185
-msgid ""
-"In this case, the `git read-tree -m $H $M` command makes sure that no local "
-"change is lost as the result of this \"merge\". Here are the \"carry "
-"forward\" rules, where \"I\" denotes the index, \"clean\" means that index "
-"and work tree coincide, and \"exists\"/\"nothing\" refer to the presence of "
-"a path in the specified commit:"
+#, priority:100
+msgid "In this case, the `git read-tree -m $H $M` command makes sure that no local change is lost as the result of this \"merge\". Here are the \"carry forward\" rules, where \"I\" denotes the index, \"clean\" means that index and work tree coincide, and \"exists\"/\"nothing\" refer to the presence of a path in the specified commit:"
msgstr ""
#. type: delimited block .
#: en/git-read-tree.txt:196
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tI H M Result\n"
" -------------------------------------------------------\n"
" 0 nothing nothing nothing (does not happen)\n"
" 1 nothing nothing exists use M\n"
" 2 nothing exists nothing remove path from index\n"
-" 3 nothing exists exists, use M if \"initial "
-"checkout\",\n"
+" 3 nothing exists exists, use M if \"initial checkout\",\n"
"\t\t\t\t H == M keep index otherwise\n"
"\t\t\t\t exists, fail\n"
"\t\t\t\t H != M\n"
@@ -44281,7 +37673,7 @@ msgstr ""
#. type: delimited block .
#: en/git-read-tree.txt:201
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" clean I==H I==M\n"
" ------------------\n"
@@ -44291,7 +37683,7 @@ msgstr ""
#. type: delimited block .
#: en/git-read-tree.txt:206
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" 6 yes N/A yes nothing exists keep index\n"
" 7 no N/A yes nothing exists keep index\n"
@@ -44301,7 +37693,7 @@ msgstr ""
#. type: delimited block .
#: en/git-read-tree.txt:211
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" 10 yes yes N/A exists nothing remove path from index\n"
" 11 no yes N/A exists nothing fail\n"
@@ -44311,7 +37703,7 @@ msgstr ""
#. type: delimited block .
#: en/git-read-tree.txt:216
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tclean (H==M)\n"
" ------\n"
@@ -44321,7 +37713,7 @@ msgstr ""
#. type: delimited block .
#: en/git-read-tree.txt:225
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" clean I==H I==M (H!=M)\n"
" ------------------\n"
@@ -44335,213 +37727,157 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:231
-msgid ""
-"In all \"keep index\" cases, the index entry stays as in the original index "
-"file. If the entry is not up to date, 'git read-tree' keeps the copy in the "
-"work tree intact when operating under the -u flag."
+#, priority:100
+msgid "In all \"keep index\" cases, the index entry stays as in the original index file. If the entry is not up to date, 'git read-tree' keeps the copy in the work tree intact when operating under the -u flag."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:242
-msgid ""
-"When this form of 'git read-tree' returns successfully, you can see which of "
-"the \"local changes\" that you made were carried forward by running `git "
-"diff-index --cached $M`. Note that this does not necessarily match what "
-"`git diff-index --cached $H` would have produced before such a two tree "
-"merge. This is because of cases 18 and 19 --- if you already had the "
-"changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git "
-"diff-index --cached $H` would have told you about the change before this "
-"merge, but it would not show in `git diff-index --cached $M` output after "
-"the two-tree merge."
+#, priority:100
+msgid "When this form of 'git read-tree' returns successfully, you can see which of the \"local changes\" that you made were carried forward by running `git diff-index --cached $M`. Note that this does not necessarily match what `git diff-index --cached $H` would have produced before such a two tree merge. This is because of cases 18 and 19 --- if you already had the changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git diff-index --cached $H` would have told you about the change before this merge, but it would not show in `git diff-index --cached $M` output after the two-tree merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:249
-msgid ""
-"Case 3 is slightly tricky and needs explanation. The result from this rule "
-"logically should be to remove the path if the user staged the removal of the "
-"path and then switching to a new branch. That however will prevent the "
-"initial checkout from happening, so the rule is modified to use M (new tree) "
-"only when the content of the index is empty. Otherwise the removal of the "
-"path is kept as long as $H and $M are the same."
+#, priority:100
+msgid "Case 3 is slightly tricky and needs explanation. The result from this rule logically should be to remove the path if the user staged the removal of the path and then switching to a new branch. That however will prevent the initial checkout from happening, so the rule is modified to use M (new tree) only when the content of the index is empty. Otherwise the removal of the path is kept as long as $H and $M are the same."
msgstr ""
#. type: Title ~
#: en/git-read-tree.txt:251
-#, no-wrap
+#, no-wrap, priority:100
msgid "3-Way Merge"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:254
-msgid ""
-"Each \"index\" entry has two bits worth of \"stage\" state. stage 0 is the "
-"normal one, and is the only one you'd see in any kind of normal use."
+#, priority:100
+msgid "Each \"index\" entry has two bits worth of \"stage\" state. stage 0 is the normal one, and is the only one you'd see in any kind of normal use."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:257
-msgid ""
-"However, when you do 'git read-tree' with three trees, the \"stage\" starts "
-"out at 1."
+#, priority:100
+msgid "However, when you do 'git read-tree' with three trees, the \"stage\" starts out at 1."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:259
+#, priority:100
msgid "This means that you can do"
msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:262
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git read-tree -m <tree1> <tree2> <tree3>\n"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:270
-msgid ""
-"and you will end up with an index with all of the <tree1> entries in "
-"\"stage1\", all of the <tree2> entries in \"stage2\" and all of the <tree3> "
-"entries in \"stage3\". When performing a merge of another branch into the "
-"current branch, we use the common ancestor tree as <tree1>, the current "
-"branch head as <tree2>, and the other branch head as <tree3>."
+#, priority:100
+msgid "and you will end up with an index with all of the <tree1> entries in \"stage1\", all of the <tree2> entries in \"stage2\" and all of the <tree3> entries in \"stage3\". When performing a merge of another branch into the current branch, we use the common ancestor tree as <tree1>, the current branch head as <tree2>, and the other branch head as <tree3>."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:274
-msgid ""
-"Furthermore, 'git read-tree' has special-case logic that says: if you see a "
-"file that matches in all respects in the following states, it \"collapses\" "
-"back to \"stage0\":"
+#, priority:100
+msgid "Furthermore, 'git read-tree' has special-case logic that says: if you see a file that matches in all respects in the following states, it \"collapses\" back to \"stage0\":"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:278
-msgid ""
-"stage 2 and 3 are the same; take one or the other (it makes no difference - "
-"the same work has been done on our branch in stage 2 and their branch in "
-"stage 3)"
+#, priority:100
+msgid "stage 2 and 3 are the same; take one or the other (it makes no difference - the same work has been done on our branch in stage 2 and their branch in stage 3)"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:283
-msgid ""
-"stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our "
-"branch in stage 2 did not do anything since the ancestor in stage 1 while "
-"their branch in stage 3 worked on it)"
+#, priority:100
+msgid "stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our branch in stage 2 did not do anything since the ancestor in stage 1 while their branch in stage 3 worked on it)"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:286
-msgid ""
-"stage 1 and stage 3 are the same and stage 2 is different take stage 2 (we "
-"did something while they did nothing)"
+#, priority:100
+msgid "stage 1 and stage 3 are the same and stage 2 is different take stage 2 (we did something while they did nothing)"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:290
-msgid ""
-"The 'git write-tree' command refuses to write a nonsensical tree, and it "
-"will complain about unmerged entries if it sees a single entry that is not "
-"stage 0."
+#, priority:100
+msgid "The 'git write-tree' command refuses to write a nonsensical tree, and it will complain about unmerged entries if it sees a single entry that is not stage 0."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:296
-msgid ""
-"OK, this all sounds like a collection of totally nonsensical rules, but it's "
-"actually exactly what you want in order to do a fast merge. The different "
-"stages represent the \"result tree\" (stage 0, aka \"merged\"), the original "
-"tree (stage 1, aka \"orig\"), and the two trees you are trying to merge "
-"(stage 2 and 3 respectively)."
+#, priority:100
+msgid "OK, this all sounds like a collection of totally nonsensical rules, but it's actually exactly what you want in order to do a fast merge. The different stages represent the \"result tree\" (stage 0, aka \"merged\"), the original tree (stage 1, aka \"orig\"), and the two trees you are trying to merge (stage 2 and 3 respectively)."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:301
-msgid ""
-"The order of stages 1, 2 and 3 (hence the order of three <tree-ish> "
-"command-line arguments) are significant when you start a 3-way merge with an "
-"index file that is already populated. Here is an outline of how the "
-"algorithm works:"
+#, priority:100
+msgid "The order of stages 1, 2 and 3 (hence the order of three <tree-ish> command-line arguments) are significant when you start a 3-way merge with an index file that is already populated. Here is an outline of how the algorithm works:"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:304
-msgid ""
-"if a file exists in identical format in all three trees, it will "
-"automatically collapse to \"merged\" state by 'git read-tree'."
+#, priority:100
+msgid "if a file exists in identical format in all three trees, it will automatically collapse to \"merged\" state by 'git read-tree'."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:309
-msgid ""
-"a file that has _any_ difference what-so-ever in the three trees will stay "
-"as separate entries in the index. It's up to \"porcelain policy\" to "
-"determine how to remove the non-0 stages, and insert a merged version."
+#, priority:100
+msgid "a file that has _any_ difference what-so-ever in the three trees will stay as separate entries in the index. It's up to \"porcelain policy\" to determine how to remove the non-0 stages, and insert a merged version."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:314
-msgid ""
-"the index file saves and restores with all this information, so you can "
-"merge things incrementally, but as long as it has entries in stages 1/2/3 "
-"(i.e., \"unmerged entries\") you can't write the result. So now the merge "
-"algorithm ends up being really simple:"
+#, priority:100
+msgid "the index file saves and restores with all this information, so you can merge things incrementally, but as long as it has entries in stages 1/2/3 (i.e., \"unmerged entries\") you can't write the result. So now the merge algorithm ends up being really simple:"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:317
-msgid ""
-"you walk the index in order, and ignore all entries of stage 0, since "
-"they've already been done."
+#, priority:100
+msgid "you walk the index in order, and ignore all entries of stage 0, since they've already been done."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:321
-msgid ""
-"if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know "
-"it's been removed from both trees (it only existed in the original tree), "
-"and you remove that entry."
+#, priority:100
+msgid "if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know it's been removed from both trees (it only existed in the original tree), and you remove that entry."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:326
-msgid ""
-"if you find a matching \"stage2\" and \"stage3\" tree, you remove one of "
-"them, and turn the other into a \"stage0\" entry. Remove any matching "
-"\"stage1\" entry if it exists too. .. all the normal trivial rules .."
+#, priority:100
+msgid "if you find a matching \"stage2\" and \"stage3\" tree, you remove one of them, and turn the other into a \"stage0\" entry. Remove any matching \"stage1\" entry if it exists too. .. all the normal trivial rules .."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:331
-msgid ""
-"You would normally use 'git merge-index' with supplied 'git merge-one-file' "
-"to do this last step. The script updates the files in the working tree as "
-"it merges each path and at the end of a successful merge."
+#, priority:100
+msgid "You would normally use 'git merge-index' with supplied 'git merge-one-file' to do this last step. The script updates the files in the working tree as it merges each path and at the end of a successful merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:339
-msgid ""
-"When you start a 3-way merge with an index file that is already populated, "
-"it is assumed that it represents the state of the files in your work tree, "
-"and you can even have files with changes unrecorded in the index file. It "
-"is further assumed that this state is \"derived\" from the stage 2 tree. "
-"The 3-way merge refuses to run if it finds an entry in the original index "
-"file that does not match stage 2."
+#, priority:100
+msgid "When you start a 3-way merge with an index file that is already populated, it is assumed that it represents the state of the files in your work tree, and you can even have files with changes unrecorded in the index file. It is further assumed that this state is \"derived\" from the stage 2 tree. The 3-way merge refuses to run if it finds an entry in the original index file that does not match stage 2."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:344
-msgid ""
-"This is done to prevent you from losing your work-in-progress changes, and "
-"mixing your random changes in an unrelated merge commit. To illustrate, "
-"suppose you start from what has been committed last to your repository:"
+#, priority:100
+msgid "This is done to prevent you from losing your work-in-progress changes, and mixing your random changes in an unrelated merge commit. To illustrate, suppose you start from what has been committed last to your repository:"
msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:348
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ JC=`git rev-parse --verify \"HEAD^0\"`\n"
"$ git checkout-index -f -u -a $JC\n"
@@ -44549,15 +37885,13 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:353
-msgid ""
-"You do random edits, without running 'git update-index'. And then you "
-"notice that the tip of your \"upstream\" tree has advanced since you pulled "
-"from him:"
+#, priority:100
+msgid "You do random edits, without running 'git update-index'. And then you notice that the tip of your \"upstream\" tree has advanced since you pulled from him:"
msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:357
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git fetch git://.... linus\n"
"$ LT=`git rev-parse FETCH_HEAD`\n"
@@ -44565,16 +37899,13 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:363
-msgid ""
-"Your work tree is still based on your HEAD ($JC), but you have some edits "
-"since. Three-way merge makes sure that you have not added or modified index "
-"entries since $JC, and if you haven't, then does the right thing. So with "
-"the following sequence:"
+#, priority:100
+msgid "Your work tree is still based on your HEAD ($JC), but you have some edits since. Three-way merge makes sure that you have not added or modified index entries since $JC, and if you haven't, then does the right thing. So with the following sequence:"
msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:369
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git read-tree -m -u `git merge-base $JC $LT` $JC $LT\n"
"$ git merge-index git-merge-one-file -a\n"
@@ -44584,79 +37915,55 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:374
-msgid ""
-"what you would commit is a pure merge between $JC and $LT without your "
-"work-in-progress changes, and your work tree would be updated to the result "
-"of the merge."
+#, priority:100
+msgid "what you would commit is a pure merge between $JC and $LT without your work-in-progress changes, and your work tree would be updated to the result of the merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:378
-msgid ""
-"However, if you have local changes in the working tree that would be "
-"overwritten by this merge, 'git read-tree' will refuse to run to prevent "
-"your changes from being lost."
+#, priority:100
+msgid "However, if you have local changes in the working tree that would be overwritten by this merge, 'git read-tree' will refuse to run to prevent your changes from being lost."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:388
-msgid ""
-"In other words, there is no need to worry about what exists only in the "
-"working tree. When you have local changes in a part of the project that is "
-"not involved in the merge, your changes do not interfere with the merge, and "
-"are kept intact. When they *do* interfere, the merge does not even start "
-"('git read-tree' complains loudly and fails without modifying anything). In "
-"such a case, you can simply continue doing what you were in the middle of "
-"doing, and when your working tree is ready (i.e. you have finished your "
-"work-in-progress), attempt the merge again."
+#, priority:100
+msgid "In other words, there is no need to worry about what exists only in the working tree. When you have local changes in a part of the project that is not involved in the merge, your changes do not interfere with the merge, and are kept intact. When they *do* interfere, the merge does not even start ('git read-tree' complains loudly and fails without modifying anything). In such a case, you can simply continue doing what you were in the middle of doing, and when your working tree is ready (i.e. you have finished your work-in-progress), attempt the merge again."
msgstr ""
#. type: Title -
#: en/git-read-tree.txt:391
-#, no-wrap
+#, no-wrap, priority:100
msgid "SPARSE CHECKOUT"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:396
-msgid ""
-"\"Sparse checkout\" allows populating the working directory sparsely. It "
-"uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git "
-"whether a file in the working directory is worth looking at."
+#, priority:100
+msgid "\"Sparse checkout\" allows populating the working directory sparsely. It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git whether a file in the working directory is worth looking at."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:405
-msgid ""
-"'git read-tree' and other merge-based commands ('git merge', 'git "
-"checkout'...) can help maintaining the skip-worktree bitmap and working "
-"directory update. `$GIT_DIR/info/sparse-checkout` is used to define the "
-"skip-worktree reference bitmap. When 'git read-tree' needs to update the "
-"working directory, it resets the skip-worktree bit in the index based on "
-"this file, which uses the same syntax as .gitignore files. If an entry "
-"matches a pattern in this file, skip-worktree will not be set on that "
-"entry. Otherwise, skip-worktree will be set."
+#, ignore-ellipsis, priority:100
+msgid "'git read-tree' and other merge-based commands ('git merge', 'git checkout'...) can help maintaining the skip-worktree bitmap and working directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-worktree reference bitmap. When 'git read-tree' needs to update the working directory, it resets the skip-worktree bit in the index based on this file, which uses the same syntax as .gitignore files. If an entry matches a pattern in this file, skip-worktree will not be set on that entry. Otherwise, skip-worktree will be set."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:409
-msgid ""
-"Then it compares the new skip-worktree value with the previous one. If "
-"skip-worktree turns from set to unset, it will add the corresponding file "
-"back. If it turns from unset to set, that file will be removed."
+#, priority:100
+msgid "Then it compares the new skip-worktree value with the previous one. If skip-worktree turns from set to unset, it will add the corresponding file back. If it turns from unset to set, that file will be removed."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:413
-msgid ""
-"While `$GIT_DIR/info/sparse-checkout` is usually used to specify what files "
-"are in, you can also specify what files are _not_ in, using negate "
-"patterns. For example, to remove the file `unwanted`:"
+#, priority:100
+msgid "While `$GIT_DIR/info/sparse-checkout` is usually used to specify what files are in, you can also specify what files are _not_ in, using negate patterns. For example, to remove the file `unwanted`:"
msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:417
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"/*\n"
"!unwanted\n"
@@ -44664,131 +37971,96 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:425
-msgid ""
-"Another tricky thing is fully repopulating the working directory when you no "
-"longer want sparse checkout. You cannot just disable \"sparse checkout\" "
-"because skip-worktree bits are still in the index and your working directory "
-"is still sparsely populated. You should re-populate the working directory "
-"with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
+#, priority:100
+msgid "Another tricky thing is fully repopulating the working directory when you no longer want sparse checkout. You cannot just disable \"sparse checkout\" because skip-worktree bits are still in the index and your working directory is still sparsely populated. You should re-populate the working directory with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:428
-#, no-wrap
+#, no-wrap, priority:100
msgid "/*\n"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:434
-msgid ""
-"Then you can disable sparse checkout. Sparse checkout support in 'git "
-"read-tree' and similar commands is disabled by default. You need to turn "
-"`core.sparseCheckout` on in order to have sparse checkout support."
+#, priority:100
+msgid "Then you can disable sparse checkout. Sparse checkout support in 'git read-tree' and similar commands is disabled by default. You need to turn `core.sparseCheckout` on in order to have sparse checkout support."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:440
#, ignore-same, priority:100
-msgid ""
-"linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]; "
-"linkgit:git-sparse-checkout[1];"
-msgstr ""
-"linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]; "
-"linkgit:git-sparse-checkout[1];"
+msgid "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]; linkgit:git-sparse-checkout[1];"
+msgstr "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]; linkgit:git-sparse-checkout[1];"
#. type: Title =
#: en/git-rebase.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-rebase(1)"
msgstr "git-rebase(1)"
#. type: Plain text
#: en/git-rebase.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-rebase - Reapply commits on top of another base tip"
msgstr "Vuelve a aplicar commits en la punta de otra rama"
#. type: Plain text
#: en/git-rebase.txt:16
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n"
"\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n"
-"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto "
-"<newbase>]\n"
+"'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n"
"\t--root [<branch>]\n"
-"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | "
-"--show-current-patch)\n"
+"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:22
-msgid ""
-"If <branch> is specified, 'git rebase' will perform an automatic `git switch "
-"<branch>` before doing anything else. Otherwise it remains on the current "
-"branch."
+#, priority:100
+msgid "If <branch> is specified, 'git rebase' will perform an automatic `git switch <branch>` before doing anything else. Otherwise it remains on the current branch."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:28
-msgid ""
-"If <upstream> is not specified, the upstream configured in "
-"branch.<name>.remote and branch.<name>.merge options will be used (see "
-"linkgit:git-config[1] for details) and the `--fork-point` option is "
-"assumed. If you are currently not on any branch or if the current branch "
-"does not have a configured upstream, the rebase will abort."
+#, priority:100
+msgid "If <upstream> is not specified, the upstream configured in branch.<name>.remote and branch.<name>.merge options will be used (see linkgit:git-config[1] for details) and the `--fork-point` option is assumed. If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:35
-msgid ""
-"All changes made by commits in the current branch but that are not in "
-"<upstream> are saved to a temporary area. This is the same set of commits "
-"that would be shown by `git log <upstream>..HEAD`; or by `git log "
-"'fork_point'..HEAD`, if `--fork-point` is active (see the description on "
-"`--fork-point` below); or by `git log HEAD`, if the `--root` option is "
-"specified."
+#, priority:100
+msgid "All changes made by commits in the current branch but that are not in <upstream> are saved to a temporary area. This is the same set of commits that would be shown by `git log <upstream>..HEAD`; or by `git log 'fork_point'..HEAD`, if `--fork-point` is active (see the description on `--fork-point` below); or by `git log HEAD`, if the `--root` option is specified."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:40
-msgid ""
-"The current branch is reset to <upstream>, or <newbase> if the --onto option "
-"was supplied. This has the exact same effect as `git reset --hard "
-"<upstream>` (or <newbase>). ORIG_HEAD is set to point at the tip of the "
-"branch before the reset."
+#, priority:100
+msgid "The current branch is reset to <upstream>, or <newbase> if the --onto option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or <newbase>). ORIG_HEAD is set to point at the tip of the branch before the reset."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:46
-msgid ""
-"The commits that were previously saved into the temporary area are then "
-"reapplied to the current branch, one by one, in order. Note that any commits "
-"in HEAD which introduce the same textual changes as a commit in "
-"HEAD..<upstream> are omitted (i.e., a patch already accepted upstream with a "
-"different commit message or timestamp will be skipped)."
+#, priority:100
+msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in HEAD which introduce the same textual changes as a commit in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:53
-msgid ""
-"It is possible that a merge failure will prevent this process from being "
-"completely automatic. You will have to resolve any such merge failure and "
-"run `git rebase --continue`. Another option is to bypass the commit that "
-"caused the merge failure with `git rebase --skip`. To check out the "
-"original <branch> and remove the .git/rebase-apply working files, use the "
-"command `git rebase --abort` instead."
+#, priority:100
+msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original <branch> and remove the .git/rebase-apply working files, use the command `git rebase --abort` instead."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:55
+#, priority:100
msgid "Assume the following history exists and the current branch is \"topic\":"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:60
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" A---B---C topic\n"
" /\n"
@@ -44797,12 +38069,13 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:63
+#, priority:100
msgid "From this point, the result of either of the following commands:"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:67
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" git rebase master\n"
" git rebase master topic\n"
@@ -44810,12 +38083,13 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:69
+#, priority:100
msgid "would be:"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:74
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" A'--B'--C' topic\n"
" /\n"
@@ -44824,7 +38098,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:79
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"*NOTE:* The latter form is just a short-hand of `git checkout topic`\n"
"followed by `git rebase master`. When rebase exits `topic` will\n"
@@ -44833,17 +38107,13 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:85
-msgid ""
-"If the upstream branch already contains a change you have made (e.g., "
-"because you mailed a patch which was applied upstream), then that commit "
-"will be skipped. For example, running `git rebase master` on the following "
-"history (in which `A'` and `A` introduce the same set of changes, but have "
-"different committer information):"
+#, priority:100
+msgid "If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running `git rebase master` on the following history (in which `A'` and `A` introduce the same set of changes, but have different committer information):"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:90
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" A---B---C topic\n"
" /\n"
@@ -44852,12 +38122,13 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:93
+#, priority:100
msgid "will result in:"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:98
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" B'---C' topic\n"
" /\n"
@@ -44866,23 +38137,19 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:103
-msgid ""
-"Here is how you would transplant a topic branch based on one branch to "
-"another, to pretend that you forked the topic branch from the latter branch, "
-"using `rebase --onto`."
+#, priority:100
+msgid "Here is how you would transplant a topic branch based on one branch to another, to pretend that you forked the topic branch from the latter branch, using `rebase --onto`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:107
-msgid ""
-"First let's assume your 'topic' is based on branch 'next'. For example, a "
-"feature developed in 'topic' depends on some functionality which is found in "
-"'next'."
+#, priority:100
+msgid "First let's assume your 'topic' is based on branch 'next'. For example, a feature developed in 'topic' depends on some functionality which is found in 'next'."
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:114
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---o---o---o---o master\n"
" \\\n"
@@ -44893,15 +38160,13 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:119
-msgid ""
-"We want to make 'topic' forked from branch 'master'; for example, because "
-"the functionality on which 'topic' depends was merged into the more stable "
-"'master' branch. We want our tree to look like this:"
+#, priority:100
+msgid "We want to make 'topic' forked from branch 'master'; for example, because the functionality on which 'topic' depends was merged into the more stable 'master' branch. We want our tree to look like this:"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:126
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---o---o---o---o master\n"
" | \\\n"
@@ -44912,25 +38177,25 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:129
+#, priority:100
msgid "We can get this using the following command:"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:131
-#, no-wrap
+#, no-wrap, priority:100
msgid " git rebase --onto master next topic\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:135
-msgid ""
-"Another example of --onto option is to rebase part of a branch. If we have "
-"the following situation:"
+#, priority:100
+msgid "Another example of --onto option is to rebase part of a branch. If we have the following situation:"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:142
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" H---I---J topicB\n"
" /\n"
@@ -44941,23 +38206,25 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:145 en/git-rebase.txt:168
+#, priority:100
msgid "then the command"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:147
-#, no-wrap
+#, no-wrap, priority:100
msgid " git rebase --onto master topicA topicB\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:149
+#, priority:100
msgid "would result in:"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:156
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" H'--I'--J' topicB\n"
" /\n"
@@ -44968,917 +38235,1074 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:159
+#, priority:100
msgid "This is useful when topicB does not depend on topicA."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:162
-msgid ""
-"A range of commits could also be removed with rebase. If we have the "
-"following situation:"
+#, priority:100
+msgid "A range of commits could also be removed with rebase. If we have the following situation:"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:165
-#, no-wrap
+#, no-wrap, priority:100
msgid " E---F---G---H---I---J topicA\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:170
-#, no-wrap
+#, no-wrap, priority:100
msgid " git rebase --onto topicA~5 topicA~3 topicA\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:172
+#, priority:100
msgid "would result in the removal of commits F and G:"
msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:175
-#, no-wrap
+#, no-wrap, priority:100
msgid " E---H'---I'---J' topicA\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:180
-msgid ""
-"This is useful if F and G were flawed in some way, or should not be part of "
-"topicA. Note that the argument to --onto and the <upstream> parameter can "
-"be any valid commit-ish."
+#, priority:100
+msgid "This is useful if F and G were flawed in some way, or should not be part of topicA. Note that the argument to --onto and the <upstream> parameter can be any valid commit-ish."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:186
-msgid ""
-"In case of conflict, 'git rebase' will stop at the first problematic commit "
-"and leave conflict markers in the tree. You can use 'git diff' to locate "
-"the markers (<<<<<<) and make edits to resolve the conflict. For each file "
-"you edit, you need to tell Git that the conflict has been resolved, "
-"typically this would be done with"
+#, priority:100
+msgid "In case of conflict, 'git rebase' will stop at the first problematic commit and leave conflict markers in the tree. You can use 'git diff' to locate the markers (<<<<<<) and make edits to resolve the conflict. For each file you edit, you need to tell Git that the conflict has been resolved, typically this would be done with"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:189
-#, no-wrap
+#, no-wrap, priority:100
msgid " git add <filename>\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:193
-msgid ""
-"After resolving the conflict manually and updating the index with the "
-"desired resolution, you can continue the rebasing process with"
+#, priority:100
+msgid "After resolving the conflict manually and updating the index with the desired resolution, you can continue the rebasing process with"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:196
-#, no-wrap
+#, no-wrap, priority:100
msgid " git rebase --continue\n"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:199
+#, priority:100
msgid "Alternatively, you can undo the 'git rebase' with"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:202
-#, no-wrap
+#, no-wrap, priority:100
msgid " git rebase --abort\n"
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:210
-#, no-wrap
+#, no-wrap, priority:100
msgid "--onto <newbase>"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:215
-msgid ""
-"Starting point at which to create the new commits. If the --onto option is "
-"not specified, the starting point is <upstream>. May be any valid commit, "
-"and not just an existing branch name."
+#, priority:100
+msgid "Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:219
-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."
+#, ignore-ellipsis, priority:100
+msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:220
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-base"
msgstr "--keep-base"
#. type: Plain text
#: en/git-rebase.txt:225
-msgid ""
-"Set the starting point at which to create the new commits to the merge base "
-"of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' "
-"is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
+#, ignore-ellipsis, priority:100
+msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:230
-msgid ""
-"This option is useful in the case where one is developing a feature on top "
-"of an upstream branch. While the feature is being worked on, the upstream "
-"branch may advance and it may not be the best idea to keep rebasing on top "
-"of the upstream but to keep the base commit as-is."
+#, priority:100
+msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:235
-msgid ""
-"Although both this option and --fork-point find the merge base between "
-"<upstream> and <branch>, this option uses the merge base as the _starting "
-"point_ on which new commits will be created, whereas --fork-point uses the "
-"merge base to determine the _set of commits_ which will be rebased."
+#, priority:100
+msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
+#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:242
-msgid ""
-"Upstream branch to compare against. May be any valid commit, not just an "
-"existing branch name. Defaults to the configured upstream for the current "
-"branch."
+#, priority:100
+msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:248
+#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:255
-msgid ""
-"Abort the rebase operation and reset HEAD to the original branch. If "
-"<branch> was provided when the rebase operation was started, then HEAD will "
-"be reset to <branch>. Otherwise HEAD will be reset to where it was when the "
-"rebase operation was started."
+#, priority:100
+msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:260
+#, priority:100
+msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
msgid ""
-"Abort the rebase operation but HEAD is not reset back to the original "
-"branch. The index and working tree are also left unchanged as a result."
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
-#, no-wrap
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
-msgid "Keep the commits that do not change anything from its parents in the result."
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
-msgid ""
-"By default, rebasing commits with an empty message will fail. This option "
-"overrides that behavior, allowing commits with empty messages to be rebased."
+#: en/git-rebase.txt:294
+#, priority:100
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:300
+#, priority:100
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:305
+#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
-#, no-wrap
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
-#, fuzzy
+#: en/git-rebase.txt:308
+#, fuzzy, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr "editar la lista de pendientes durante el rebase interactivo"
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
-msgid ""
-"Show the current patch in an interactive rebase or when rebase is stopped "
-"because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
+#: en/git-rebase.txt:313
+#, priority:100
+msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
-msgid ""
-"Use merging strategies to rebase. When the recursive (default) merge "
-"strategy is used, this allows rebase to be aware of renames on the upstream "
-"side."
+#: en/git-rebase.txt:319
+#, priority:100
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
-msgid ""
-"Note that a rebase merge works by replaying each commit from the working "
-"branch on top of the <upstream> branch. Because of this, when a merge "
-"conflict happens, the side reported as 'ours' is the so-far rebased series, "
-"starting with <upstream>, and 'theirs' is the working branch. In other "
-"words, the sides are swapped."
+#: en/git-rebase.txt:325
+#, priority:100
+msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
-msgid ""
-"Use the given merge strategy. If there is no `-s` option 'git "
-"merge-recursive' is used instead. This implies --merge."
+#: en/git-rebase.txt:333
+#, priority:100
+msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
-msgid ""
-"Because 'git rebase' replays each commit from the working branch on top of "
-"the <upstream> branch using the given strategy, using the 'ours' strategy "
-"simply empties all patches from the <branch>, which makes little sense."
+#: en/git-rebase.txt:338
+#, priority:100
+msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
-#, fuzzy, no-wrap
+#: en/git-rebase.txt:341
+#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:313
-#, no-wrap
+#: en/git-rebase.txt:342
+#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
-msgid ""
-"Pass the <strategy-option> through to the merge strategy. This implies "
-"`--merge` and, if no strategy has been specified, `-s recursive`. Note the "
-"reversal of 'ours' and 'theirs' as noted above for the `-m` option."
+#: en/git-rebase.txt:347
+#, priority:100
+msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
-#, fuzzy
+#: en/git-rebase.txt:364
+#, fuzzy, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr "ser silencioso implica --no-stat"
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
+#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
-msgid ""
-"Show a diffstat of what changed upstream since the last rebase. The diffstat "
-"is also controlled by the configuration option rebase.stat."
+#: en/git-rebase.txt:372
+#, priority:100
+msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
+#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
+#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
-#, no-wrap
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
-msgid ""
-"Allows the pre-rebase hook to run, which is the default. This option can be "
-"used to override --no-verify. See also linkgit:githooks[5]."
+#: en/git-rebase.txt:383
+#, priority:100
+msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
-#, no-wrap
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
-#, no-wrap
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
-msgid ""
-"Individually replay all rebased commits instead of fast-forwarding over the "
-"unchanged ones. This ensures that the entire history of the rebased branch "
-"is composed of new commits."
+#: en/git-rebase.txt:398
+#, priority:100
+msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
-msgid ""
-"You may find this helpful after reverting a topic branch merge, as this "
-"option recreates the topic branch with fresh commits so it can be remerged "
-"successfully without needing to \"revert the reversion\" (see the "
-"link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for "
-"details)."
+#: en/git-rebase.txt:404
+#, priority:100
+msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
-#, no-wrap
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
-msgid ""
-"Use reflog to find a better common ancestor between <upstream> and <branch> "
-"when calculating which commits have been introduced by <branch>."
+#: en/git-rebase.txt:410
+#, priority:100
+msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
-msgid ""
-"When --fork-point is active, 'fork_point' will be used instead of <upstream> "
-"to calculate the set of commits to rebase, where 'fork_point' is the result "
-"of `git merge-base --fork-point <upstream> <branch>` command (see "
-"linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the "
-"<upstream> will be used as a fallback."
+#: en/git-rebase.txt:416
+#, priority:100
+msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
-msgid ""
-"If either <upstream> or --root is given on the command line, then the "
-"default is `--no-fork-point`, otherwise the default is `--fork-point`."
+#: en/git-rebase.txt:419
+#, priority:100
+msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
-msgid ""
-"If your branch was based on <upstream> but <upstream> was rewound and your "
-"branch contains commits which were dropped, this option can be used with "
-"`--keep-base` in order to drop those commits from your branch."
+#: en/git-rebase.txt:423
+#, priority:100
+msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
-msgid ""
-"These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) "
-"that applies the patch."
+#: en/git-rebase.txt:429
+#, priority:100
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
-msgid ""
-"These flags are passed to 'git am' to easily change the dates of the rebased "
-"commits (see linkgit:git-am[1])."
+#: en/git-rebase.txt:436
+#, priority:100
+msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
-msgid ""
-"Add a Signed-off-by: trailer to all the rebased commits. Note that if "
-"`--interactive` is given then only commits marked to be picked, edited or "
-"reworded will have the trailer added."
+#: en/git-rebase.txt:443
+#, priority:100
+msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
-msgid ""
-"Make a list of the commits which are about to be rebased. Let the user edit "
-"that list before rebasing. This mode can also be used to split commits (see "
-"SPLITTING COMMITS below)."
+#: en/git-rebase.txt:451
+#, priority:100
+msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
-msgid ""
-"The commit list format can be changed by setting the configuration option "
-"rebase.instructionFormat. A customized instruction format will "
-"automatically have the long commit hash prepended to the format."
+#: en/git-rebase.txt:455
+#, priority:100
+msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
-#, no-wrap
+#: en/git-rebase.txt:459
+#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
-msgid ""
-"By default, a rebase will simply drop merge commits from the todo list, and "
-"put the rebased commits into a single, linear branch. With "
-"`--rebase-merges`, the rebase will instead try to preserve the branching "
-"structure within the commits that are to be rebased, by recreating the merge "
-"commits. Any resolved merge conflicts or manual amendments in these merge "
-"commits will have to be resolved/re-applied manually."
+#: en/git-rebase.txt:467
+#, priority:100
+msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
-msgid ""
-"By default, or when `no-rebase-cousins` was specified, commits which do not "
-"have `<upstream>` as direct ancestor will keep their original branch point, "
-"i.e. commits that would be excluded by linkgit:git-log[1]'s "
-"`--ancestry-path` option will keep their original ancestry by default. If "
-"the `rebase-cousins` mode is turned on, such commits are instead rebased "
-"onto `<upstream>` (or `<onto>`, if specified)."
+#: en/git-rebase.txt:474
+#, priority:100
+msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
-msgid ""
-"The `--rebase-merges` mode is similar in spirit to the deprecated "
-"`--preserve-merges` but works with interactive rebases, where commits can be "
-"reordered, inserted and dropped at will."
+#: en/git-rebase.txt:478
+#, priority:100
+msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
-msgid ""
-"It is currently only possible to recreate the merge commits using the "
-"`recursive` merge strategy; Different merge strategies can be used only via "
-"explicit `exec git merge -s <strategy> [...]` commands."
+#: en/git-rebase.txt:482
+#, ignore-ellipsis, priority:100
+msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
+#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
-#, no-wrap
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
-msgid ""
-"[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead "
-"of flattening the history by replaying commits a merge commit "
-"introduces. Merge conflict resolutions or manual amendments to merge commits "
-"are not preserved."
+#: en/git-rebase.txt:491
+#, priority:100
+msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
-msgid ""
-"This uses the `--interactive` machinery internally, but combining it with "
-"the `--interactive` option explicitly is generally not a good idea unless "
-"you know what you are doing (see BUGS below)."
+#: en/git-rebase.txt:495
+#, priority:100
+msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
-#, no-wrap
+#: en/git-rebase.txt:498
+#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
-#, no-wrap
+#: en/git-rebase.txt:499
+#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
-msgid ""
-"Append \"exec <cmd>\" after each line creating a commit in the final "
-"history. <cmd> will be interpreted as one or more shell commands. Any "
-"command that fails will interrupt the rebase, with exit code 1."
+#: en/git-rebase.txt:504
+#, priority:100
+msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
-msgid ""
-"You may execute several commands by either using one instance of `--exec` "
-"with several commands:"
+#: en/git-rebase.txt:507
+#, priority:100
+msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
-#, no-wrap
+#: en/git-rebase.txt:509
+#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
+#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
-#, no-wrap
+#: en/git-rebase.txt:513
+#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
-msgid ""
-"If `--autosquash` is used, \"exec\" lines will not be appended for the "
-"intermediate commits, and will only appear at the end of each squash/fixup "
-"series."
+#: en/git-rebase.txt:517
+#, priority:100
+msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
-msgid ""
-"This uses the `--interactive` machinery internally, but it can be run "
-"without an explicit `--interactive`."
+#: en/git-rebase.txt:520
+#, priority:100
+msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
-msgid ""
-"Rebase all commits reachable from <branch>, instead of limiting them with an "
-"<upstream>. This allows you to rebase the root commit(s) on a branch. When "
-"used with --onto, it will skip changes already contained in <newbase> "
-"(instead of <upstream>) whereas without --onto it will operate on every "
-"change. When used together with both --onto and --preserve-merges, 'all' "
-"root commits will be rewritten to have <newbase> as parent instead."
+#: en/git-rebase.txt:532
+#, priority:100
+msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
-#, no-wrap
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
-#, no-wrap
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
-msgid ""
-"When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), "
-"and there is already a commit in the todo list that matches the same `...`, "
-"automatically modify the todo list of rebase -i so that the commit marked "
-"for squashing comes right after the commit to be modified, and change the "
-"action of the moved commit from `pick` to `squash` (or `fixup`). A commit "
-"matches the `...` if the commit subject matches, or if the `...` refers to "
-"the commit's hash. As a fall-back, partial matches of the commit subject "
-"work, too. The recommended way to create fixup/squash commits is by using "
-"the `--fixup`/`--squash` options of linkgit:git-commit[1]."
+#: en/git-rebase.txt:547
+#, ignore-ellipsis, priority:100
+msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
-msgid ""
-"If the `--autosquash` option is enabled by default using the configuration "
-"variable `rebase.autoSquash`, this option can be used to override and "
-"disable this setting."
+#: en/git-rebase.txt:551
+#, priority:100
+msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
-msgid ""
-"Automatically create a temporary stash entry before the operation begins, "
-"and apply it after the operation ends. This means that you can run rebase "
-"on a dirty worktree. However, use with care: the final stash application "
-"after a successful rebase might result in non-trivial conflicts."
+#: en/git-rebase.txt:561
+#, priority:100
+msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
-#, no-wrap
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
-#, no-wrap
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
-msgid ""
-"Automatically reschedule `exec` commands that failed. This only makes sense "
-"in interactive mode (or when an `--exec` option was provided)."
+#: en/git-rebase.txt:566
+#, priority:100
+msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
-#, no-wrap
+#: en/git-rebase.txt:568
+#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
+#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
+#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
-#, no-wrap
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
+#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
+#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
+#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
+#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
+#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
+#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
+#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
+#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
-#, no-wrap
-msgid "There are some subtle differences how the backends behave.\n"
+#: en/git-rebase.txt:614
+#, no-wrap, priority:100
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
-#, no-wrap
+#: en/git-rebase.txt:617
+#, no-wrap, priority:100
msgid ""
"Empty commits\n"
"~~~~~~~~~~~~~\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
-#, no-wrap
+#: en/git-rebase.txt:622
+#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
-#, no-wrap
+#: en/git-rebase.txt:629
+#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
-#, no-wrap
+#: en/git-rebase.txt:632
+#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
-#, no-wrap
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
-#, no-wrap
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
+#, no-wrap, priority:100
+msgid ""
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:733
+#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
-#, no-wrap
+#: en/git-rebase.txt:735
+#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
-msgid ""
-"You should understand the implications of using 'git rebase' on a repository "
-"that you share. See also RECOVERING FROM UPSTREAM REBASE below."
+#: en/git-rebase.txt:740
+#, priority:100
+msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
-msgid ""
-"When the git-rebase command is run, it will first execute a \"pre-rebase\" "
-"hook if one exists. You can use this hook to do sanity checks and reject "
-"the rebase if it isn't appropriate. Please see the template pre-rebase hook "
-"script for an example."
+#: en/git-rebase.txt:745
+#, priority:100
+msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
+#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
-msgid ""
-"Rebasing interactively means that you have a chance to edit the commits "
-"which are rebased. You can reorder the commits, and you can remove them "
-"(weeding out bad or otherwise unwanted patches)."
+#: en/git-rebase.txt:754
+#, priority:100
+msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
+#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
+#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
+#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
+#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
+#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
+#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
+#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
+#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
-#, fuzzy
+#: en/git-rebase.txt:768
+#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
+#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
+#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
+#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
+#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
-msgid ""
-"Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect "
-"commit it fixes, because that commit is buried deeply in a patch series. "
-"That is exactly what interactive rebase is for: use it after plenty of "
-"\"a\"s and \"b\"s, by rearranging and editing commits, and squashing "
-"multiple commits into one."
+#: en/git-rebase.txt:780
+#, priority:100
+msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
+#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
-#, no-wrap
+#: en/git-rebase.txt:784
+#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
-msgid ""
-"An editor will be fired up with all the commits in your current branch "
-"(ignoring merge commits), which come after the given commit. You can "
-"reorder the commits in this list to your heart's content, and you can remove "
-"them. The list looks more or less like this:"
+#: en/git-rebase.txt:789
+#, priority:100
+msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
-#, no-wrap
+#: en/git-rebase.txt:794
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
"pick fa1afe1 The oneline of the next commit\n"
@@ -45886,91 +39310,74 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
-msgid ""
-"The oneline descriptions are purely for your pleasure; 'git rebase' will not "
-"look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this "
-"example), so do not delete or edit the names."
+#: en/git-rebase.txt:799
+#, priority:100
+msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
-msgid ""
-"By replacing the command \"pick\" with the command \"edit\", you can tell "
-"'git rebase' to stop after applying that commit, so that you can edit the "
-"files and/or the commit message, amend the commit, and continue rebasing."
+#: en/git-rebase.txt:804
+#, priority:100
+msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
-msgid ""
-"To interrupt the rebase (just like an \"edit\" command would do, but without "
-"cherry-picking any commit first), use the \"break\" command."
+#: en/git-rebase.txt:807
+#, priority:100
+msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
-msgid ""
-"If you just want to edit the commit message for a commit, replace the "
-"command \"pick\" with the command \"reword\"."
+#: en/git-rebase.txt:810
+#, priority:100
+msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
-msgid ""
-"To drop a commit, replace the command \"pick\" with \"drop\", or just delete "
-"the matching line."
+#: en/git-rebase.txt:813
+#, priority:100
+msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
-msgid ""
-"If you want to fold two or more commits into one, replace the command "
-"\"pick\" for the second and subsequent commits with \"squash\" or "
-"\"fixup\". If the commits had different authors, the folded commit will be "
-"attributed to the author of the first commit. The suggested commit message "
-"for the folded commit is the concatenation of the commit messages of the "
-"first commit and of those with the \"squash\" command, but omits the commit "
-"messages of commits with the \"fixup\" command."
+#: en/git-rebase.txt:821
+#, priority:100
+msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
-msgid ""
-"'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when "
-"a command fails due to merge errors. When you are done editing and/or "
-"resolving conflicts you can continue with `git rebase --continue`."
+#: en/git-rebase.txt:825
+#, priority:100
+msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
-msgid ""
-"For example, if you want to reorder the last 5 commits, such that what was "
-"HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' "
-"like this:"
+#: en/git-rebase.txt:829
+#, priority:100
+msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
-#, no-wrap
+#: en/git-rebase.txt:832
+#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
+#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
-msgid ""
-"You might want to recreate merge commits, e.g. if you have a history like "
-"this:"
+#: en/git-rebase.txt:838
+#, priority:100
+msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
-#, no-wrap
+#: en/git-rebase.txt:845
+#, no-wrap, priority:100
msgid ""
" X\n"
" \\\n"
@@ -45980,31 +39387,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
-msgid ""
-"Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make "
-"sure that the current HEAD is \"B\", and call"
+#: en/git-rebase.txt:849
+#, priority:100
+msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
-#, no-wrap
+#: en/git-rebase.txt:852
+#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
-msgid ""
-"Reordering and editing commits usually creates untested intermediate steps. "
-"You may want to check that your history editing did not break anything by "
-"running a test, or at least recompiling at intermediate points in history by "
-"using the \"exec\" command (shortcut \"x\"). You may do so by creating a "
-"todo list like this one:"
+#: en/git-rebase.txt:859
+#, priority:100
+msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
-#, no-wrap
+#: en/git-rebase.txt:868
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
"fixup f1a5c00 Fix to feature XXX\n"
@@ -46016,38 +39418,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
-msgid ""
-"The interactive rebase will stop when a command fails (i.e. exits with non-0 "
-"status) to give you an opportunity to fix the problem. You can continue with "
-"`git rebase --continue`."
+#: en/git-rebase.txt:873
+#, priority:100
+msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
-msgid ""
-"The \"exec\" command launches the command in a shell (the one specified in "
-"`$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell "
-"features (like \"cd\", \">\", \";\" ...). The command is run from the root "
-"of the working tree."
+#: en/git-rebase.txt:878
+#, ignore-ellipsis, priority:100
+msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
-#, no-wrap
+#: en/git-rebase.txt:881
+#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
-msgid ""
-"This command lets you check that intermediate commits are compilable. The "
-"todo list becomes like that:"
+#: en/git-rebase.txt:885
+#, priority:100
+msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
-#, no-wrap
+#: en/git-rebase.txt:895
+#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
"exec make test\n"
@@ -46060,102 +39456,86 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
-#, no-wrap
+#: en/git-rebase.txt:898
+#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
-msgid ""
-"In interactive mode, you can mark commits with the action \"edit\". "
-"However, this does not necessarily mean that 'git rebase' expects the result "
-"of this edit to be exactly one commit. Indeed, you can undo the commit, or "
-"you can add other commits. This can be used to split a commit into two:"
+#: en/git-rebase.txt:904
+#, priority:100
+msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
-msgid ""
-"Start an interactive rebase with `git rebase -i <commit>^`, where <commit> "
-"is the commit you want to split. In fact, any commit range will do, as long "
-"as it contains that commit."
+#: en/git-rebase.txt:908
+#, priority:100
+msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
+#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
-msgid ""
-"When it comes to editing that commit, execute `git reset HEAD^`. The effect "
-"is that the HEAD is rewound by one, and the index follows suit. However, "
-"the working tree stays the same."
+#: en/git-rebase.txt:914
+#, priority:100
+msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
-msgid ""
-"Now add the changes to the index that you want to have in the first commit. "
-"You can use `git add` (possibly interactively) or 'git gui' (or both) to do "
-"that."
+#: en/git-rebase.txt:918
+#, priority:100
+msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
-msgid ""
-"Commit the now-current index with whatever commit message is appropriate "
-"now."
+#: en/git-rebase.txt:921
+#, priority:100
+msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
+#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
+#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
-msgid ""
-"If you are not absolutely sure that the intermediate revisions are "
-"consistent (they compile, pass the testsuite, etc.) you should use 'git "
-"stash' to stash away the not-yet-committed changes after each commit, test, "
-"and amend the commit if fixes are necessary."
+#: en/git-rebase.txt:930
+#, priority:100
+msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
-#, no-wrap
+#: en/git-rebase.txt:933
+#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
-msgid ""
-"Rebasing (or any other form of rewriting) a branch that others have based "
-"work on is a bad idea: anyone downstream of it is forced to manually fix "
-"their history. This section explains how to do the fix from the "
-"downstream's point of view. The real fix, however, would be to avoid "
-"rebasing the upstream in the first place."
+#: en/git-rebase.txt:940
+#, priority:100
+msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
-msgid ""
-"To illustrate, suppose you are in a situation where someone develops a "
-"'subsystem' branch, and you are working on a 'topic' that is dependent on "
-"this 'subsystem'. You might end up with a history like the following:"
+#: en/git-rebase.txt:945
+#, priority:100
+msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
-#, no-wrap
+#: en/git-rebase.txt:952
+#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
"\t \\\n"
@@ -46165,13 +39545,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
+#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
-#, no-wrap
+#: en/git-rebase.txt:962
+#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
"\t \\\t\t\t \\\n"
@@ -46181,15 +39562,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
-msgid ""
-"If you now continue development as usual, and eventually merge 'topic' to "
-"'subsystem', the commits from 'subsystem' will remain duplicated forever:"
+#: en/git-rebase.txt:966
+#, priority:100
+msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
-#, no-wrap
+#: en/git-rebase.txt:973
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
"\t \\\t\t\t \\\n"
@@ -46199,84 +39579,74 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
-msgid ""
-"Such duplicates are generally frowned upon because they clutter up history, "
-"making it harder to follow. To clean things up, you need to transplant the "
-"commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This "
-"becomes a ripple effect: anyone downstream from 'topic' is forced to rebase "
-"too, and so on!"
+#: en/git-rebase.txt:980
+#, priority:100
+msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
+#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
-#, no-wrap
+#: en/git-rebase.txt:983
+#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
-msgid ""
-"This happens if the 'subsystem' rebase was a simple rebase and had no "
-"conflicts."
+#: en/git-rebase.txt:987
+#, priority:100
+msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
-#, no-wrap
+#: en/git-rebase.txt:988
+#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
-msgid ""
-"This happens if the 'subsystem' rebase had conflicts, or used "
-"`--interactive` to omit, edit, squash, or fixup commits; or if the upstream "
-"used one of `commit --amend`, `reset`, or a full history rewriting command "
-"like https://github.com/newren/git-filter-repo[`filter-repo`]."
+#: en/git-rebase.txt:995
+#, priority:100
+msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
-#, no-wrap
+#: en/git-rebase.txt:998
+#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
-msgid ""
-"Only works if the changes (patch IDs based on the diff contents) on "
-"'subsystem' are literally the same before and after the rebase 'subsystem' "
-"did."
+#: en/git-rebase.txt:1003
+#, priority:100
+msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
-msgid ""
-"In that case, the fix is easy because 'git rebase' knows to skip changes "
-"that are already present in the new upstream. So if you say (assuming "
-"you're on 'topic')"
+#: en/git-rebase.txt:1007
+#, priority:100
+msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
-#, no-wrap
+#: en/git-rebase.txt:1009
+#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
+#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
-#, no-wrap
+#: en/git-rebase.txt:1017
+#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
"\t\t\t\t \\\n"
@@ -46286,21 +39656,20 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
-#, no-wrap
+#: en/git-rebase.txt:1021
+#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
-msgid ""
-"Things get more complicated if the 'subsystem' changes do not exactly "
-"correspond to the ones before the rebase."
+#: en/git-rebase.txt:1025
+#, priority:100
+msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
-#, no-wrap
+#: en/git-rebase.txt:1030
+#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
" even in the hard case, it may have unintended consequences. For\n"
@@ -46309,86 +39678,68 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
-msgid ""
-"The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended "
-"and your 'topic' began\", that is, what the old merge base between them "
-"was. You will have to find a way to name the last commit of the old "
-"'subsystem', for example:"
+#: en/git-rebase.txt:1035
+#, priority:100
+msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
-msgid ""
-"With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' "
-"is at `subsystem@{1}`. Subsequent fetches will increase the number. (See "
-"linkgit:git-reflog[1].)"
+#: en/git-rebase.txt:1039
+#, priority:100
+msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
-msgid ""
-"Relative to the tip of 'topic': knowing that your 'topic' has three commits, "
-"the old tip of 'subsystem' must be `topic~3`."
+#: en/git-rebase.txt:1042
+#, priority:100
+msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
-msgid ""
-"You can then transplant the old `subsystem..topic` to the new tip by saying "
-"(for the reflog case, and assuming you are on 'topic' already):"
+#: en/git-rebase.txt:1045
+#, priority:100
+msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
-#, no-wrap
+#: en/git-rebase.txt:1047
+#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
-msgid ""
-"The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' "
-"downstream from 'topic' will now have to perform a \"hard case\" recovery "
-"too!"
+#: en/git-rebase.txt:1052
+#, priority:100
+msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
-#, no-wrap
+#: en/git-rebase.txt:1054
+#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
-msgid ""
-"The interactive rebase command was originally designed to handle individual "
-"patch series. As such, it makes sense to exclude merge commits from the todo "
-"list, as the developer may have merged the then-current `master` while "
-"working on the branch, only to rebase all the commits onto `master` "
-"eventually (skipping the merge commits)."
+#: en/git-rebase.txt:1062
+#, priority:100
+msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
-msgid ""
-"However, there are legitimate reasons why a developer may want to recreate "
-"merge commits: to keep the branch structure (or \"commit topology\") when "
-"working on multiple, inter-related branches."
+#: en/git-rebase.txt:1066
+#, priority:100
+msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
-msgid ""
-"In the following example, the developer works on a topic branch that "
-"refactors the way buttons are defined, and on another topic branch that uses "
-"that refactoring to implement a \"Report a bug\" button. The output of `git "
-"log --graph --format=%s -5` may look like this:"
+#: en/git-rebase.txt:1071
+#, priority:100
+msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
-#, no-wrap
+#: en/git-rebase.txt:1081
+#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
"|\\\n"
@@ -46401,31 +39752,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
-msgid ""
-"The developer might want to rebase those commits to a newer `master` while "
-"keeping the branch topology, for example when the first topic branch is "
-"expected to be integrated into `master` much earlier than the second one, "
-"say, to resolve merge conflicts with changes to the DownloadButton class "
-"that made it into `master`."
+#: en/git-rebase.txt:1088
+#, priority:100
+msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
-msgid ""
-"This rebase can be performed using the `--rebase-merges` option. It will "
-"generate a todo list looking like this:"
+#: en/git-rebase.txt:1091
+#, priority:100
+msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
-#, no-wrap
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
+#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
-#, no-wrap
+#: en/git-rebase.txt:1100
+#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
"reset onto\n"
@@ -46435,8 +39781,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
-#, no-wrap
+#: en/git-rebase.txt:1105
+#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
"reset refactor-button # Use the Button class for all buttons\n"
@@ -46445,8 +39791,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
-#, no-wrap
+#: en/git-rebase.txt:1109
+#, no-wrap, priority:100
msgid ""
"reset onto\n"
"merge -C a1b2c3 refactor-button # Merge 'refactor-button'\n"
@@ -46454,84 +39800,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
-msgid ""
-"In contrast to a regular interactive rebase, there are `label`, `reset` and "
-"`merge` commands in addition to `pick` ones."
+#: en/git-rebase.txt:1113
+#, priority:100
+msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
-msgid ""
-"The `label` command associates a label with the current HEAD when that "
-"command is executed. These labels are created as worktree-local refs "
-"(`refs/rewritten/<label>`) that will be deleted when the rebase "
-"finishes. That way, rebase operations in multiple worktrees linked to the "
-"same repository do not interfere with one another. If the `label` command "
-"fails, it is rescheduled immediately, with a helpful message how to proceed."
+#: en/git-rebase.txt:1121
+#, priority:100
+msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
-msgid ""
-"The `reset` command resets the HEAD, index and worktree to the specified "
-"revision. It is similar to an `exec git reset --hard <label>`, but refuses "
-"to overwrite untracked files. If the `reset` command fails, it is "
-"rescheduled immediately, with a helpful message how to edit the todo list "
-"(this typically happens when a `reset` command was inserted into the todo "
-"list manually and contains a typo)."
+#: en/git-rebase.txt:1128
+#, priority:100
+msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
-msgid ""
-"The `merge` command will merge the specified revision(s) into whatever is "
-"HEAD at that time. With `-C <original-commit>`, the commit message of the "
-"specified merge commit will be used. When the `-C` is changed to a "
-"lower-case `-c`, the message will be opened in an editor after a successful "
-"merge so that the user can edit the message."
+#: en/git-rebase.txt:1134
+#, priority:100
+msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
-msgid ""
-"If a `merge` command fails for any reason other than merge conflicts (i.e. "
-"when the merge operation did not even start), it is rescheduled immediately."
+#: en/git-rebase.txt:1137
+#, priority:100
+msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
-msgid ""
-"At this time, the `merge` command will *always* use the `recursive` merge "
-"strategy for regular merges, and `octopus` for octopus merges, with no way "
-"to choose a different one. To work around this, an `exec` command can be "
-"used to call `git merge` explicitly, using the fact that the labels are "
-"worktree-local refs (the ref `refs/rewritten/onto` would correspond to the "
-"label `onto`, for example)."
+#: en/git-rebase.txt:1144
+#, priority:100
+msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
-msgid ""
-"Note: the first command (`label onto`) labels the revision onto which the "
-"commits are rebased; The name `onto` is just a convention, as a nod to the "
-"`--onto` option."
+#: en/git-rebase.txt:1148
+#, priority:100
+msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
-msgid ""
-"It is also possible to introduce completely new merge commits from scratch "
-"by adding a command of the form `merge <merge-head>`. This form will "
-"generate a tentative commit message and always open an editor to let the "
-"user edit it. This can be useful e.g. when a topic branch turns out to "
-"address more than a single concern and wants to be split into two or even "
-"more topic branches. Consider this todo list:"
+#: en/git-rebase.txt:1155
+#, priority:100
+msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
-#, no-wrap
+#: en/git-rebase.txt:1162
+#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
"pick 5a6c7e Document the switch to CMake\n"
@@ -46541,25 +39859,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
-msgid ""
-"The one commit in this list that is not related to CMake may very well have "
-"been motivated by working on fixing all those bugs introduced by switching "
-"to CMake, but it addresses a different concern. To split this branch into "
-"two topic branches, the todo list could be edited like this:"
+#: en/git-rebase.txt:1168
+#, priority:100
+msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
-#, no-wrap
+#: en/git-rebase.txt:1174
+#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
"label tlsv1.3\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
-#, no-wrap
+#: en/git-rebase.txt:1181
+#, no-wrap, priority:100
msgid ""
"reset onto\n"
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -46570,8 +39885,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
-#, no-wrap
+#: en/git-rebase.txt:1185
+#, no-wrap, priority:100
msgid ""
"reset onto\n"
"merge tlsv1.3\n"
@@ -46579,40 +39894,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
-msgid ""
-"The todo list presented by the deprecated `--preserve-merges --interactive` "
-"does not represent the topology of the revision graph (use `--rebase-merges` "
-"instead). Editing commits and rewording their commit messages should work "
-"fine, but attempts to reorder commits tend to produce counterintuitive "
-"results. Use `--rebase-merges` in such scenarios instead."
+#: en/git-rebase.txt:1194
+#, priority:100
+msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
+#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
-#, no-wrap
+#: en/git-rebase.txt:1198
+#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
-#, no-wrap
+#: en/git-rebase.txt:1202
+#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
+#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
-#, no-wrap
+#: en/git-rebase.txt:1208
+#, no-wrap, priority:100
msgid ""
"\t3\n"
" /\n"
@@ -46621,370 +39934,307 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-receive-pack(1)"
msgstr "git-receive-pack(1)"
#. type: Plain text
#: en/git-receive-pack.txt:7
+#, priority:100
msgid "git-receive-pack - Receive what is pushed into the repository"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git-receive-pack' <directory>\n"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:18
-msgid ""
-"Invoked by 'git send-pack' and updates the repository with the information "
-"fed from the remote end."
+#, priority:100
+msgid "Invoked by 'git send-pack' and updates the repository with the information fed from the remote end."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:23
-msgid ""
-"This command is usually not invoked directly by the end user. The UI for "
-"the protocol is on the 'git send-pack' side, and the program pair is meant "
-"to be used to push updates to remote repository. For pull operations, see "
-"linkgit:git-fetch-pack[1]."
+#, priority:100
+msgid "This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git send-pack' side, and the program pair is meant to be used to push updates to remote repository. For pull operations, see linkgit:git-fetch-pack[1]."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:28
-msgid ""
-"The command allows for creation and fast-forwarding of sha1 refs "
-"(heads/tags) on the remote end (strictly speaking, it is the local end "
-"'git-receive-pack' runs, but to the user who is sitting at the send-pack "
-"end, it is updating the remote. Confused?)"
+#, priority:100
+msgid "The command allows for creation and fast-forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the local end 'git-receive-pack' runs, but to the user who is sitting at the send-pack end, it is updating the remote. Confused?)"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:31
-msgid ""
-"There are other real-world examples of using update and post-update hooks "
-"found in the Documentation/howto directory."
+#, priority:100
+msgid "There are other real-world examples of using update and post-update hooks found in the Documentation/howto directory."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:35
-msgid ""
-"'git-receive-pack' honours the receive.denyNonFastForwards config option, "
-"which tells it if updates to a ref should be denied if they are not "
-"fast-forwards."
+#, priority:100
+msgid "'git-receive-pack' honours the receive.denyNonFastForwards config option, which tells it if updates to a ref should be denied if they are not fast-forwards."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:38
-msgid ""
-"A number of other receive.* config options are available to tweak its "
-"behavior, see linkgit:git-config[1]."
+#, priority:100
+msgid "A number of other receive.* config options are available to tweak its behavior, see linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:43
+#, priority:100
msgid "The repository to sync into."
msgstr ""
#. type: Title -
#: en/git-receive-pack.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "PRE-RECEIVE HOOK"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:49
-msgid ""
-"Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists and is "
-"executable, it will be invoked once with no parameters. The standard input "
-"of the hook will be one line per ref to be updated:"
+#, priority:100
+msgid "Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists and is executable, it will be invoked once with no parameters. The standard input of the hook will be one line per ref to be updated:"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:51 en/git-receive-pack.txt:150
-#, no-wrap
+#, no-wrap, priority:100
msgid " sha1-old SP sha1-new SP refname LF\n"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:58
-msgid ""
-"The refname value is relative to $GIT_DIR; e.g. for the master head this is "
-"\"refs/heads/master\". The two sha1 values before each refname are the "
-"object names for the refname before and after the update. Refs to be "
-"created will have sha1-old equal to 0\\{40}, while refs to be deleted will "
-"have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should be "
-"valid objects in the repository."
+#, priority:100
+msgid "The refname value is relative to $GIT_DIR; e.g. for the master head this is \"refs/heads/master\". The two sha1 values before each refname are the object names for the refname before and after the update. Refs to be created will have sha1-old equal to 0\\{40}, while refs to be deleted will have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should be valid objects in the repository."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:65
-msgid ""
-"When accepting a signed push (see linkgit:git-push[1]), the signed push "
-"certificate is stored in a blob and an environment variable `GIT_PUSH_CERT` "
-"can be consulted for its object name. See the description of `post-receive` "
-"hook for an example. In addition, the certificate is verified using GPG and "
-"the result is exported with the following environment variables:"
+#, priority:100
+msgid "When accepting a signed push (see linkgit:git-push[1]), the signed push certificate is stored in a blob and an environment variable `GIT_PUSH_CERT` can be consulted for its object name. See the description of `post-receive` hook for an example. In addition, the certificate is verified using GPG and the result is exported with the following environment variables:"
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr "`GIT_PUSH_CERT_SIGNER`"
#. type: Plain text
#: en/git-receive-pack.txt:69
-msgid ""
-"The name and the e-mail address of the owner of the key that signed the push "
-"certificate."
+#, priority:100
+msgid "The name and the e-mail address of the owner of the key that signed the push certificate."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_KEY`"
msgstr "`GIT_PUSH_CERT_KEY`"
#. type: Plain text
#: en/git-receive-pack.txt:72
+#, priority:100
msgid "The GPG key ID of the key that signed the push certificate."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr "`GIT_PUSH_CERT_STATUS`"
#. type: Plain text
#: en/git-receive-pack.txt:77
-msgid ""
-"The status of GPG verification of the push certificate, using the same "
-"mnemonic as used in `%G?` format of `git log` family of commands (see "
-"linkgit:git-log[1])."
+#, priority:100
+msgid "The status of GPG verification of the push certificate, using the same mnemonic as used in `%G?` format of `git log` family of commands (see linkgit:git-log[1])."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr "`GIT_PUSH_CERT_NONCE`"
#. type: Plain text
#: en/git-receive-pack.txt:84
-msgid ""
-"The nonce string the process asked the signer to include in the push "
-"certificate. If this does not match the value recorded on the \"nonce\" "
-"header in the push certificate, it may indicate that the certificate is a "
-"valid one that is being replayed from a separate \"git push\" session."
+#, priority:100
+msgid "The nonce string the process asked the signer to include in the push certificate. If this does not match the value recorded on the \"nonce\" header in the push certificate, it may indicate that the certificate is a valid one that is being replayed from a separate \"git push\" session."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
msgstr "`GIT_PUSH_CERT_NONCE_STATUS`"
#. type: Labeled list
#: en/git-receive-pack.txt:86
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`UNSOLICITED`"
msgstr "`UNSOLICITED`"
#. type: Plain text
#: en/git-receive-pack.txt:89
+#, priority:100
msgid "\"git push --signed\" sent a nonce when we did not ask it to send one."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`MISSING`"
msgstr "`MISSING`"
#. type: Plain text
#: en/git-receive-pack.txt:91
+#, priority:100
msgid "\"git push --signed\" did not send any nonce header."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`BAD`"
msgstr "`BAD`"
#. type: Plain text
#: en/git-receive-pack.txt:93
+#, priority:100
msgid "\"git push --signed\" sent a bogus nonce."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`OK`"
msgstr "`OK`"
#. type: Plain text
#: en/git-receive-pack.txt:95
+#, priority:100
msgid "\"git push --signed\" sent the nonce we asked it to send."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`SLOP`"
msgstr "`SLOP`"
#. type: Plain text
#: en/git-receive-pack.txt:99
-msgid ""
-"\"git push --signed\" sent a nonce different from what we asked it to send "
-"now, but in a previous session. See `GIT_PUSH_CERT_NONCE_SLOP` environment "
-"variable."
+#, priority:100
+msgid "\"git push --signed\" sent a nonce different from what we asked it to send now, but in a previous session. See `GIT_PUSH_CERT_NONCE_SLOP` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
#. type: Plain text
#: en/git-receive-pack.txt:108
-msgid ""
-"\"git push --signed\" sent a nonce different from what we asked it to send "
-"now, but in a different session whose starting time is different by this "
-"many seconds from the current session. Only meaningful when "
-"`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. Also read about "
-"`receive.certNonceSlop` variable in linkgit:git-config[1]."
+#, priority:100
+msgid "\"git push --signed\" sent a nonce different from what we asked it to send now, but in a different session whose starting time is different by this many seconds from the current session. Only meaningful when `GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. Also read about `receive.certNonceSlop` variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:111
-msgid ""
-"This hook is called before any refname is updated and before any "
-"fast-forward checks are performed."
+#, priority:100
+msgid "This hook is called before any refname is updated and before any fast-forward checks are performed."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:116
-msgid ""
-"If the pre-receive hook exits with a non-zero exit status no updates will be "
-"performed, and the update, post-receive and post-update hooks will not be "
-"invoked either. This can be useful to quickly bail out if the update is not "
-"to be supported."
+#, priority:100
+msgid "If the pre-receive hook exits with a non-zero exit status no updates will be performed, and the update, post-receive and post-update hooks will not be invoked either. This can be useful to quickly bail out if the update is not to be supported."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:118
+#, priority:100
msgid "See the notes on the quarantine environment below."
msgstr ""
#. type: Title -
#: en/git-receive-pack.txt:120
-#, no-wrap
+#, no-wrap, priority:100
msgid "UPDATE HOOK"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:123
-msgid ""
-"Before each ref is updated, if $GIT_DIR/hooks/update file exists and is "
-"executable, it is invoked once per ref, with three parameters:"
+#, priority:100
+msgid "Before each ref is updated, if $GIT_DIR/hooks/update file exists and is executable, it is invoked once per ref, with three parameters:"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:125
-#, no-wrap
+#, no-wrap, priority:100
msgid " $GIT_DIR/hooks/update refname sha1-old sha1-new\n"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:132
-msgid ""
-"The refname parameter is relative to $GIT_DIR; e.g. for the master head this "
-"is \"refs/heads/master\". The two sha1 arguments are the object names for "
-"the refname before and after the update. Note that the hook is called "
-"before the refname is updated, so either sha1-old is 0\\{40} (meaning there "
-"is no such ref yet), or it should match what is recorded in refname."
+#, priority:100
+msgid "The refname parameter is relative to $GIT_DIR; e.g. for the master head this is \"refs/heads/master\". The two sha1 arguments are the object names for the refname before and after the update. Note that the hook is called before the refname is updated, so either sha1-old is 0\\{40} (meaning there is no such ref yet), or it should match what is recorded in refname."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:135
-msgid ""
-"The hook should exit with non-zero status if it wants to disallow updating "
-"the named ref. Otherwise it should exit with zero."
+#, priority:100
+msgid "The hook should exit with non-zero status if it wants to disallow updating the named ref. Otherwise it should exit with zero."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:140
-msgid ""
-"Successful execution (a zero exit status) of this hook does not ensure the "
-"ref will actually be updated, it is only a prerequisite. As such it is not "
-"a good idea to send notices (e.g. email) from this hook. Consider using the "
-"post-receive hook instead."
+#, priority:100
+msgid "Successful execution (a zero exit status) of this hook does not ensure the ref will actually be updated, it is only a prerequisite. As such it is not a good idea to send notices (e.g. email) from this hook. Consider using the post-receive hook instead."
msgstr ""
#. type: Title -
#: en/git-receive-pack.txt:142
-#, no-wrap
+#, no-wrap, priority:100
msgid "POST-RECEIVE HOOK"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:148
-msgid ""
-"After all refs were updated (or attempted to be updated), if any ref update "
-"was successful, and if $GIT_DIR/hooks/post-receive file exists and is "
-"executable, it will be invoked once with no parameters. The standard input "
-"of the hook will be one line for each successfully updated ref:"
+#, priority:100
+msgid "After all refs were updated (or attempted to be updated), if any ref update was successful, and if $GIT_DIR/hooks/post-receive file exists and is executable, it will be invoked once with no parameters. The standard input of the hook will be one line for each successfully updated ref:"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:158
-msgid ""
-"The refname value is relative to $GIT_DIR; e.g. for the master head this is "
-"\"refs/heads/master\". The two sha1 values before each refname are the "
-"object names for the refname before and after the update. Refs that were "
-"created will have sha1-old equal to 0\\{40}, while refs that were deleted "
-"will have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should "
-"be valid objects in the repository."
+#, priority:100
+msgid "The refname value is relative to $GIT_DIR; e.g. for the master head this is \"refs/heads/master\". The two sha1 values before each refname are the object names for the refname before and after the update. Refs that were created will have sha1-old equal to 0\\{40}, while refs that were deleted will have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should be valid objects in the repository."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:161
-msgid ""
-"The `GIT_PUSH_CERT*` environment variables can be inspected, just as in "
-"`pre-receive` hook, after accepting a signed push."
+#, priority:100
+msgid "The `GIT_PUSH_CERT*` environment variables can be inspected, just as in `pre-receive` hook, after accepting a signed push."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:167
-msgid ""
-"Using this hook, it is easy to generate mails describing the updates to the "
-"repository. This example script sends one mail message per ref listing the "
-"commits pushed to the repository, and logs the push certificates of signed "
-"pushes with good signatures to a logger service:"
+#, priority:100
+msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
#. type: delimited block -
#: en/git-receive-pack.txt:192
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
"# mail out commit update information.\n"
@@ -47006,61 +40256,50 @@ msgid ""
"\t(\n"
"\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
"\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" "
-"push-log@mydomain\n"
+"\t) | mail -s \"push certificate from $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
"fi\n"
"exit 0\n"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:196
-msgid ""
-"The exit code from this hook invocation is ignored, however a non-zero exit "
-"code will generate an error message."
+#, priority:100
+msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:202
-msgid ""
-"Note that it is possible for refname to not have sha1-new when this hook "
-"runs. This can easily occur if another user modifies the ref after it was "
-"updated by 'git-receive-pack', but before the hook was able to evaluate it. "
-"It is recommended that hooks rely on sha1-new rather than the current value "
-"of refname."
+#, priority:100
+msgid "Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname."
msgstr ""
#. type: Title -
#: en/git-receive-pack.txt:204
-#, no-wrap
+#, no-wrap, priority:100
msgid "POST-UPDATE HOOK"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:209
-msgid ""
-"After all other processing, if at least one ref was updated, and if "
-"$GIT_DIR/hooks/post-update file exists and is executable, then post-update "
-"will be called with the list of refs that have been updated. This can be "
-"used to implement any repository wide cleanup tasks."
+#, priority:100
+msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:213
-msgid ""
-"The exit code from this hook invocation is ignored; the only thing left for "
-"'git-receive-pack' to do at that point is to exit itself anyway."
+#, priority:100
+msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:216
-msgid ""
-"This hook can be used, for example, to run `git update-server-info` if the "
-"repository is packed and is served via a dumb transport."
+#, priority:100
+msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
#. type: delimited block -
#: en/git-receive-pack.txt:220
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
"exec git update-server-info\n"
@@ -47068,49 +40307,38 @@ msgstr ""
#. type: Title -
#: en/git-receive-pack.txt:224
-#, no-wrap
+#, no-wrap, priority:100
msgid "QUARANTINE ENVIRONMENT"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:231
-msgid ""
-"When `receive-pack` takes in objects, they are placed into a temporary "
-"\"quarantine\" directory within the `$GIT_DIR/objects` directory and "
-"migrated into the main object store only after the `pre-receive` hook has "
-"completed. If the push fails before then, the temporary directory is removed "
-"entirely."
+#, priority:100
+msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:233
+#, priority:100
msgid "This has a few user-visible effects and caveats:"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:239
-msgid ""
-"Pushes which fail due to problems with the incoming pack, missing objects, "
-"or due to the `pre-receive` hook will not leave any on-disk data. This is "
-"usually helpful to prevent repeated failed pushes from filling up your disk, "
-"but can make debugging more challenging."
+#, priority:100
+msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:242
-msgid ""
-"Any objects created by the `pre-receive` hook will be created in the "
-"quarantine directory (and migrated only if it succeeds)."
+#, priority:100
+msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:248
-msgid ""
-"The `pre-receive` hook MUST NOT update any refs to point to quarantined "
-"objects. Other programs accessing the repository will not be able to see the "
-"objects (and if the pre-receive hook fails, those refs would become "
-"corrupted). For safety, any ref updates from within `pre-receive` are "
-"automatically rejected."
+#, priority:100
+msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
msgstr ""
#. type: Plain text
@@ -47121,25 +40349,25 @@ msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-reflog.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-reflog(1)"
msgstr "git-reflog(1)"
#. type: Plain text
#: en/git-reflog.txt:7
+#, priority:100
msgid "git-reflog - Manage reflog information"
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git reflog' <subcommand> <options>\n"
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:27
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git reflog' ['show'] [log-options] [<ref>]\n"
"'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n"
@@ -47152,473 +40380,410 @@ msgstr ""
#. type: Plain text
#: en/git-reflog.txt:35
-msgid ""
-"Reference logs, or \"reflogs\", record when the tips of branches and other "
-"references were updated in the local repository. Reflogs are useful in "
-"various Git commands, to specify the old value of a reference. For example, "
-"`HEAD@{2}` means \"where HEAD used to be two moves ago\", "
-"`master@{one.week.ago}` means \"where master used to point to one week ago "
-"in this local repository\", and so on. See linkgit:gitrevisions[7] for more "
-"details."
+#, priority:100
+msgid "Reference logs, or \"reflogs\", record when the tips of branches and other references were updated in the local repository. Reflogs are useful in various Git commands, to specify the old value of a reference. For example, `HEAD@{2}` means \"where HEAD used to be two moves ago\", `master@{one.week.ago}` means \"where master used to point to one week ago in this local repository\", and so on. See linkgit:gitrevisions[7] for more details."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:37
+#, priority:100
msgid "This command manages the information recorded in the reflogs."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:44
-msgid ""
-"The \"show\" subcommand (which is also the default, in the absence of any "
-"subcommands) shows the log of the reference provided in the command-line (or "
-"`HEAD`, by default). The reflog covers all recent actions, and in addition "
-"the `HEAD` reflog records branch switching. `git reflog show` is an alias "
-"for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1] "
-"for more information."
+#, priority:100
+msgid "The \"show\" subcommand (which is also the default, in the absence of any subcommands) shows the log of the reference provided in the command-line (or `HEAD`, by default). The reflog covers all recent actions, and in addition the `HEAD` reflog records branch switching. `git reflog show` is an alias for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1] for more information."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:50
-msgid ""
-"The \"expire\" subcommand prunes older reflog entries. Entries older than "
-"`expire` time, or entries older than `expire-unreachable` time and not "
-"reachable from the current tip, are removed from the reflog. This is "
-"typically not used directly by end users -- instead, see linkgit:git-gc[1]."
+#, priority:100
+msgid "The \"expire\" subcommand prunes older reflog entries. Entries older than `expire` time, or entries older than `expire-unreachable` time and not reachable from the current tip, are removed from the reflog. This is typically not used directly by end users -- instead, see linkgit:git-gc[1]."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:55
-msgid ""
-"The \"delete\" subcommand deletes single entries from the reflog. Its "
-"argument must be an _exact_ entry (e.g. \"`git reflog delete "
-"master@{2}`\"). This subcommand is also typically not used directly by end "
-"users."
+#, priority:100
+msgid "The \"delete\" subcommand deletes single entries from the reflog. Its argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\"). This subcommand is also typically not used directly by end users."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:59
-msgid ""
-"The \"exists\" subcommand checks whether a ref has a reflog. It exits with "
-"zero status if the reflog exists, and non-zero status if it does not."
+#, priority:100
+msgid "The \"exists\" subcommand checks whether a ref has a reflog. It exits with zero status if the reflog exists, and non-zero status if it does not."
msgstr ""
#. type: Title ~
#: en/git-reflog.txt:64
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for `show`"
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:67
+#, priority:100
msgid "`git reflog show` accepts any of the options accepted by `git log`."
msgstr ""
#. type: Title ~
#: en/git-reflog.txt:70
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for `expire`"
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:74
+#, priority:100
msgid "Process the reflogs of all references."
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:75 en/rev-list-options.txt:193
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--single-worktree"
msgstr "--single-worktree"
#. type: Plain text
#: en/git-reflog.txt:79
-msgid ""
-"By default when `--all` is specified, reflogs from all working trees are "
-"processed. This option limits the processing to reflogs from the current "
-"working tree only."
+#, priority:100
+msgid "By default when `--all` is specified, reflogs from all working trees are processed. This option limits the processing to reflogs from the current working tree only."
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:80
-#, no-wrap
+#, no-wrap, priority:100
msgid "--expire=<time>"
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:87
-msgid ""
-"Prune entries older than the specified time. If this option is not "
-"specified, the expiration time is taken from the configuration setting "
-"`gc.reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes "
-"entries regardless of their age; `--expire=never` turns off pruning of "
-"reachable entries (but see `--expire-unreachable`)."
+#, priority:100
+msgid "Prune entries older than the specified time. If this option is not specified, the expiration time is taken from the configuration setting `gc.reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes entries regardless of their age; `--expire=never` turns off pruning of reachable entries (but see `--expire-unreachable`)."
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:88
-#, no-wrap
+#, no-wrap, priority:100
msgid "--expire-unreachable=<time>"
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:97
-msgid ""
-"Prune entries older than `<time>` that are not reachable from the current "
-"tip of the branch. If this option is not specified, the expiration time is "
-"taken from the configuration setting `gc.reflogExpireUnreachable`, which in "
-"turn defaults to 30 days. `--expire-unreachable=all` prunes unreachable "
-"entries regardless of their age; `--expire-unreachable=never` turns off "
-"early pruning of unreachable entries (but see `--expire`)."
+#, priority:100
+msgid "Prune entries older than `<time>` that are not reachable from the current tip of the branch. If this option is not specified, the expiration time is taken from the configuration setting `gc.reflogExpireUnreachable`, which in turn defaults to 30 days. `--expire-unreachable=all` prunes unreachable entries regardless of their age; `--expire-unreachable=never` turns off early pruning of unreachable entries (but see `--expire`)."
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--updateref"
msgstr "--updateref"
#. type: Plain text
#: en/git-reflog.txt:102
-msgid ""
-"Update the reference to the value of the top reflog entry (i.e. "
-"<ref>@\\{0\\}) if the previous top entry was pruned. (This option is "
-"ignored for symbolic references.)"
+#, priority:100
+msgid "Update the reference to the value of the top reflog entry (i.e. <ref>@\\{0\\}) if the previous top entry was pruned. (This option is ignored for symbolic references.)"
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--rewrite"
msgstr "--rewrite"
#. type: Plain text
#: en/git-reflog.txt:107
-msgid ""
-"If a reflog entry's predecessor is pruned, adjust its \"old\" SHA-1 to be "
-"equal to the \"new\" SHA-1 field of the entry that now precedes it."
+#, priority:100
+msgid "If a reflog entry's predecessor is pruned, adjust its \"old\" SHA-1 to be equal to the \"new\" SHA-1 field of the entry that now precedes it."
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:108
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stale-fix"
msgstr "--stale-fix"
#. type: Plain text
#: en/git-reflog.txt:113
-msgid ""
-"Prune any reflog entries that point to \"broken commits\". A broken commit "
-"is a commit that is not reachable from any of the reference tips and that "
-"refers, directly or indirectly, to a missing commit, tree, or blob object."
+#, priority:100
+msgid "Prune any reflog entries that point to \"broken commits\". A broken commit is a commit that is not reachable from any of the reference tips and that refers, directly or indirectly, to a missing commit, tree, or blob object."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:118
-msgid ""
-"This computation involves traversing all the reachable objects, i.e. it has "
-"the same cost as 'git prune'. It is primarily intended to fix corruption "
-"caused by garbage collecting using older versions of Git, which didn't "
-"protect objects referred to by reflogs."
+#, priority:100
+msgid "This computation involves traversing all the reachable objects, i.e. it has the same cost as 'git prune'. It is primarily intended to fix corruption caused by garbage collecting using older versions of Git, which didn't protect objects referred to by reflogs."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:123
+#, priority:100
msgid "Do not actually prune any entries; just show what would have been pruned."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:126
+#, priority:100
msgid "Print extra information on screen."
msgstr ""
#. type: Title ~
#: en/git-reflog.txt:129
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for `delete`"
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:134
-msgid ""
-"`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, "
-"`--dry-run`, and `--verbose`, with the same meanings as when they are used "
-"with `expire`."
+#, priority:100
+msgid "`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, `--dry-run`, and `--verbose`, with the same meanings as when they are used with `expire`."
msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-remote-ext(1)"
msgstr "git-remote-ext(1)"
#. type: Plain text
#: en/git-remote-ext.txt:7
+#, priority:100
msgid "git-remote-ext - Bridge smart transport to external command."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:12
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:17
-msgid ""
-"This remote helper uses the specified '<command>' to connect to a remote Git "
-"server."
+#, priority:100
+msgid "This remote helper uses the specified '<command>' to connect to a remote Git server."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:23
-msgid ""
-"Data written to stdin of the specified '<command>' is assumed to be sent to "
-"a git:// server, git-upload-pack, git-receive-pack or git-upload-archive "
-"(depending on situation), and data read from stdout of <command> is assumed "
-"to be received from the same service."
+#, priority:100
+msgid "Data written to stdin of the specified '<command>' is assumed to be sent to a git:// server, git-upload-pack, git-receive-pack or git-upload-archive (depending on situation), and data read from stdout of <command> is assumed to be received from the same service."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:25
+#, priority:100
msgid "Command and arguments are separated by an unescaped space."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:27
+#, priority:100
msgid "The following sequences have a special meaning:"
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:28
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'% '"
msgstr "'%s'"
#. type: Plain text
#: en/git-remote-ext.txt:30
+#, priority:100
msgid "Literal space in command or argument."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:31 en/pretty-formats.txt:118
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:260
msgid "'%%'"
msgstr "'%s'"
#. type: Plain text
#: en/git-remote-ext.txt:33
+#, priority:100
msgid "Literal percent sign."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:34 en/pretty-formats.txt:208
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%s'"
msgstr "'%s'"
#. type: Plain text
#: en/git-remote-ext.txt:37
-msgid ""
-"Replaced with name (receive-pack, upload-pack, or upload-archive) of the "
-"service Git wants to invoke."
+#, priority:100
+msgid "Replaced with name (receive-pack, upload-pack, or upload-archive) of the service Git wants to invoke."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:38 en/pretty-formats.txt:205
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%S'"
msgstr "'%S'"
#. type: Plain text
#: en/git-remote-ext.txt:42
-msgid ""
-"Replaced with long name (git-receive-pack, git-upload-pack, or "
-"git-upload-archive) of the service Git wants to invoke."
+#, priority:100
+msgid "Replaced with long name (git-receive-pack, git-upload-pack, or git-upload-archive) of the service Git wants to invoke."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:43
-#, no-wrap
+#, no-wrap, priority:100
msgid "'%G' (must be the first characters in an argument)"
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:49
-msgid ""
-"This argument will not be passed to '<command>'. Instead, it will cause the "
-"helper to start by sending git:// service requests to the remote side with "
-"the service field set to an appropriate value and the repository field set "
-"to rest of the argument. Default is not to send such a request."
+#, priority:100
+msgid "This argument will not be passed to '<command>'. Instead, it will cause the helper to start by sending git:// service requests to the remote side with the service field set to an appropriate value and the repository field set to rest of the argument. Default is not to send such a request."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:52
+#, priority:100
msgid "This is useful if remote side is git:// server accessed over some tunnel."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:53
-#, no-wrap
+#, no-wrap, priority:100
msgid "'%V' (must be first characters in argument)"
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:57
-msgid ""
-"This argument will not be passed to '<command>'. Instead it sets the vhost "
-"field in the git:// service request (to rest of the argument). Default is "
-"not to send vhost in such request (if sent)."
+#, priority:100
+msgid "This argument will not be passed to '<command>'. Instead it sets the vhost field in the git:// service request (to rest of the argument). Default is not to send vhost in such request (if sent)."
msgstr ""
#. type: Title -
#: en/git-remote-ext.txt:59 en/git-remote-fd.txt:32
-#, no-wrap
+#, no-wrap, priority:100
msgid "ENVIRONMENT VARIABLES"
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_TRANSLOOP_DEBUG"
msgstr "GIT_TRANSLOOP_DEBUG"
#. type: Plain text
#: en/git-remote-ext.txt:63 en/git-remote-fd.txt:35
+#, priority:100
msgid "If set, prints debugging information about various reads/writes."
msgstr ""
#. type: Title -
#: en/git-remote-ext.txt:65
-#, no-wrap
+#, no-wrap, priority:100
msgid "ENVIRONMENT VARIABLES PASSED TO COMMAND"
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:67
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_EXT_SERVICE"
msgstr "GIT_EXT_SERVICE"
#. type: Plain text
#: en/git-remote-ext.txt:70
-msgid ""
-"Set to long name (git-upload-pack, etc...) of service helper needs to "
-"invoke."
+#, ignore-ellipsis, priority:100
+msgid "Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:71
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_EXT_SERVICE_NOPREFIX"
msgstr "GIT_EXT_SERVICE_NOPREFIX"
#. type: Plain text
#: en/git-remote-ext.txt:74
+#, ignore-ellipsis, priority:100
msgid "Set to long name (upload-pack, etc...) of service helper needs to invoke."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:82
-msgid ""
-"This remote helper is transparently used by Git when you use commands such "
-"as \"git fetch <URL>\", \"git clone <URL>\", , \"git push <URL>\" or \"git "
-"remote add <nick> <URL>\", where <URL> begins with `ext::`. Examples:"
+#, priority:100
+msgid "This remote helper is transparently used by Git when you use commands such as \"git fetch <URL>\", \"git clone <URL>\", , \"git push <URL>\" or \"git remote add <nick> <URL>\", where <URL> begins with `ext::`. Examples:"
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:83
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"ext::ssh -i /home/foo/.ssh/somekey user@host.example %S 'foo/repo'\""
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:87
-msgid ""
-"Like host.example:foo/repo, but use /home/foo/.ssh/somekey as keypair and "
-"user as user on remote side. This avoids needing to edit .ssh/config."
+#, priority:100
+msgid "Like host.example:foo/repo, but use /home/foo/.ssh/somekey as keypair and user as user on remote side. This avoids needing to edit .ssh/config."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:88
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo\""
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:91
-msgid ""
-"Represents repository with path /somerepo accessible over git protocol at "
-"abstract namespace address /git-server."
+#, priority:100
+msgid "Represents repository with path /somerepo accessible over git protocol at abstract namespace address /git-server."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:92
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"ext::git-server-alias foo %G/repo\""
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:98
-msgid ""
-"Represents a repository with path /repo accessed using the helper program "
-"\"git-server-alias foo\". The path to the repository and type of request "
-"are not passed on the command line but as part of the protocol stream, as "
-"usual with git:// protocol."
+#, priority:100
+msgid "Represents a repository with path /repo accessed using the helper program \"git-server-alias foo\". The path to the repository and type of request are not passed on the command line but as part of the protocol stream, as usual with git:// protocol."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:99
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"ext::git-server-alias foo %G/repo %Vfoo\""
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:105
-msgid ""
-"Represents a repository with path /repo accessed using the helper program "
-"\"git-server-alias foo\". The hostname for the remote server passed in the "
-"protocol stream will be \"foo\" (this allows multiple virtual Git servers to "
-"share a link-level address)."
+#, priority:100
+msgid "Represents a repository with path /repo accessed using the helper program \"git-server-alias foo\". The hostname for the remote server passed in the protocol stream will be \"foo\" (this allows multiple virtual Git servers to share a link-level address)."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:106
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"ext::git-server-alias foo %G/repo% with% spaces %Vfoo\""
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:112
-msgid ""
-"Represents a repository with path `/repo with spaces` accessed using the "
-"helper program \"git-server-alias foo\". The hostname for the remote server "
-"passed in the protocol stream will be \"foo\" (this allows multiple virtual "
-"Git servers to share a link-level address)."
+#, priority:100
+msgid "Represents a repository with path `/repo with spaces` accessed using the helper program \"git-server-alias foo\". The hostname for the remote server passed in the protocol stream will be \"foo\" (this allows multiple virtual Git servers to share a link-level address)."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:113
-#, no-wrap
+#, no-wrap, priority:100
msgid "\"ext::git-ssl foo.example /bar\""
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:118
-msgid ""
-"Represents a repository accessed using the helper program \"git-ssl "
-"foo.example /bar\". The type of request can be determined by the helper "
-"using environment variables (see above)."
+#, priority:100
+msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)."
msgstr ""
#. type: Plain text
@@ -47629,109 +40794,100 @@ msgstr "linkgit:gitremote-helpers[7]"
#. type: Title =
#: en/git-remote-fd.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-remote-fd(1)"
msgstr "git-remote-fd(1)"
#. type: Plain text
#: en/git-remote-fd.txt:7
+#, priority:100
msgid "git-remote-fd - Reflect smart transport stream back to caller"
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:11
+#, priority:100
msgid "\"fd::<infd>[,<outfd>][/<anything>]\" (as URL)"
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:17
-msgid ""
-"This helper uses specified file descriptors to connect to a remote Git "
-"server. This is not meant for end users but for programs and scripts "
-"calling git fetch, push or archive."
+#, priority:100
+msgid "This helper uses specified file descriptors to connect to a remote Git server. This is not meant for end users but for programs and scripts calling git fetch, push or archive."
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:23
-msgid ""
-"If only <infd> is given, it is assumed to be a bidirectional socket "
-"connected to remote Git server (git-upload-pack, git-receive-pack or "
-"git-upload-archive). If both <infd> and <outfd> are given, they are assumed "
-"to be pipes connected to a remote Git server (<infd> being the inbound pipe "
-"and <outfd> being the outbound pipe."
+#, priority:100
+msgid "If only <infd> is given, it is assumed to be a bidirectional socket connected to remote Git server (git-upload-pack, git-receive-pack or git-upload-archive). If both <infd> and <outfd> are given, they are assumed to be pipes connected to a remote Git server (<infd> being the inbound pipe and <outfd> being the outbound pipe."
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:26
-msgid ""
-"It is assumed that any handshaking procedures have already been completed "
-"(such as sending service request for git://) before this helper is started."
+#, priority:100
+msgid "It is assumed that any handshaking procedures have already been completed (such as sending service request for git://) before this helper is started."
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:30
-msgid ""
-"<anything> can be any string. It is ignored. It is meant for providing "
-"information to user in the URL in case that URL is displayed in some "
-"context."
+#, priority:100
+msgid "<anything> can be any string. It is ignored. It is meant for providing information to user in the URL in case that URL is displayed in some context."
msgstr ""
#. type: Labeled list
#: en/git-remote-fd.txt:38
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git fetch fd::17 master`"
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:41
+#, priority:100
msgid "Fetch master, using file descriptor #17 to communicate with git-upload-pack."
msgstr ""
#. type: Labeled list
#: en/git-remote-fd.txt:42
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git fetch fd::17/foo master`"
msgstr ""
#. type: Labeled list
#: en/git-remote-fd.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git push fd::7,8 master (as URL)`"
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:49
-msgid ""
-"Push master, using file descriptor #7 to read data from git-receive-pack and "
-"file descriptor #8 to write data to same service."
+#, priority:100
+msgid "Push master, using file descriptor #7 to read data from git-receive-pack and file descriptor #8 to write data to same service."
msgstr ""
#. type: Labeled list
#: en/git-remote-fd.txt:50
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git push fd::7,8/bar master`"
msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "git-remote(1)"
msgstr "git-remote(1)"
#. type: Plain text
#: en/git-remote.txt:7
+#, priority:220
msgid "git-remote - Manage set of tracked repositories"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:25
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] "
-"[--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -47742,369 +40898,312 @@ msgid ""
"'git remote set-url --delete' [--push] <name> <url>\n"
"'git remote' [-v | --verbose] 'show' [-n] <name>...\n"
"'git remote prune' [-n | --dry-run] <name>...\n"
-"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | "
-"<remote>)...]\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:30
+#, priority:220
msgid "Manage the set of repositories (\"remotes\") whose branches you track."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
-msgid ""
-"Be a little more verbose and show remote url after name. NOTE: This must be "
-"placed between `remote` and `subcommand`."
+#, priority:220
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:46
-msgid ""
-"With no arguments, shows a list of existing remotes. Several subcommands "
-"are available to perform operations on the remotes."
+#, priority:220
+msgid "With no arguments, shows a list of existing remotes. Several subcommands are available to perform operations on the remotes."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:47
-#, no-wrap
+#, no-wrap, priority:220
msgid "'add'"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
-msgid ""
-"Adds a remote named <name> for the repository at <url>. The command `git "
-"fetch <name>` can then be used to create and update remote-tracking branches "
-"<name>/<branch>."
+#, priority:220
+msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:55
-msgid ""
-"With `-f` option, `git fetch <name>` is run immediately after the remote "
-"information is set up."
+#, priority:220
+msgid "With `-f` option, `git fetch <name>` is run immediately after the remote information is set up."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:58
-msgid ""
-"With `--tags` option, `git fetch <name>` imports every tag from the remote "
-"repository."
+#, priority:220
+msgid "With `--tags` option, `git fetch <name>` imports every tag from the remote repository."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:61
-msgid ""
-"With `--no-tags` option, `git fetch <name>` does not import tags from the "
-"remote repository."
+#, priority:220
+msgid "With `--no-tags` option, `git fetch <name>` does not import tags from the remote repository."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:64
-msgid ""
-"By default, only tags on fetched branches are imported (see "
-"linkgit:git-fetch[1])."
+#, priority:220
+msgid "By default, only tags on fetched branches are imported (see linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:70
-msgid ""
-"With `-t <branch>` option, instead of the default glob refspec for the "
-"remote to track all branches under the `refs/remotes/<name>/` namespace, a "
-"refspec to track only `<branch>` is created. You can give more than one `-t "
-"<branch>` to track multiple branches without grabbing all branches."
+#, priority:220
+msgid "With `-t <branch>` option, instead of the default glob refspec for the remote to track all branches under the `refs/remotes/<name>/` namespace, a refspec to track only `<branch>` is created. You can give more than one `-t <branch>` to track multiple branches without grabbing all branches."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:73
-msgid ""
-"With `-m <master>` option, a symbolic-ref `refs/remotes/<name>/HEAD` is set "
-"up to point at remote's `<master>` branch. See also the set-head command."
+#, priority:220
+msgid "With `-m <master>` option, a symbolic-ref `refs/remotes/<name>/HEAD` is set up to point at remote's `<master>` branch. See also the set-head command."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:79
-msgid ""
-"When a fetch mirror is created with `--mirror=fetch`, the refs will not be "
-"stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on "
-"the remote will be directly mirrored into 'refs/' in the local "
-"repository. This option only makes sense in bare repositories, because a "
-"fetch would overwrite any local commits."
+#, priority:220
+msgid "When a fetch mirror is created with `--mirror=fetch`, the refs will not be stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on the remote will be directly mirrored into 'refs/' in the local repository. This option only makes sense in bare repositories, because a fetch would overwrite any local commits."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:82
-msgid ""
-"When a push mirror is created with `--mirror=push`, then `git push` will "
-"always behave as if `--mirror` was passed."
+#, priority:220
+msgid "When a push mirror is created with `--mirror=push`, then `git push` will always behave as if `--mirror` was passed."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:83
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "'rename'"
msgstr "'rebase'"
#. type: Plain text
#: en/git-remote.txt:87
-msgid ""
-"Rename the remote named <old> to <new>. All remote-tracking branches and "
-"configuration settings for the remote are updated."
+#, priority:220
+msgid "Rename the remote named <old> to <new>. All remote-tracking branches and configuration settings for the remote are updated."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:91
-msgid ""
-"In case <old> and <new> are the same, and <old> is a file under "
-"`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the "
-"configuration file format."
+#, priority:220
+msgid "In case <old> and <new> are the same, and <old> is a file under `$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the configuration file format."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:92
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "'remove'"
msgstr "remove"
#. type: Labeled list
#: en/git-remote.txt:93
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "'rm'"
msgstr "'%m'"
#. type: Plain text
#: en/git-remote.txt:97
-msgid ""
-"Remove the remote named <name>. All remote-tracking branches and "
-"configuration settings for the remote are removed."
+#, priority:220
+msgid "Remove the remote named <name>. All remote-tracking branches and configuration settings for the remote are removed."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:98
-#, no-wrap
+#, no-wrap, priority:220
msgid "'set-head'"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:107
-msgid ""
-"Sets or deletes the default branch (i.e. the target of the symbolic-ref "
-"`refs/remotes/<name>/HEAD`) for the named remote. Having a default branch "
-"for a remote is not required, but allows the name of the remote to be "
-"specified in lieu of a specific branch. For example, if the default branch "
-"for `origin` is set to `master`, then `origin` may be specified wherever you "
-"would normally specify `origin/master`."
+#, priority:220
+msgid "Sets or deletes the default branch (i.e. the target of the symbolic-ref `refs/remotes/<name>/HEAD`) for the named remote. Having a default branch for a remote is not required, but allows the name of the remote to be specified in lieu of a specific branch. For example, if the default branch for `origin` is set to `master`, then `origin` may be specified wherever you would normally specify `origin/master`."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:109
-msgid ""
-"With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is "
-"deleted."
+#, priority:220
+msgid "With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
-msgid ""
-"With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then "
-"the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., "
-"if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin "
-"-a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to "
-"`refs/remotes/origin/next`. This will only work if "
-"`refs/remotes/origin/next` already exists; if not it must be fetched first."
+#, priority:220
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
-msgid ""
-"Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` "
-"explicitly. e.g., \"git remote set-head origin master\" will set the "
-"symbolic-ref `refs/remotes/origin/HEAD` to "
-"`refs/remotes/origin/master`. This will only work if "
-"`refs/remotes/origin/master` already exists; if not it must be fetched "
-"first."
+#, priority:220
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:123
-#, no-wrap
+#, no-wrap, priority:220
msgid "'set-branches'"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:128
-msgid ""
-"Changes the list of branches tracked by the named remote. This can be used "
-"to track a subset of the available remote branches after the initial setup "
-"for a remote."
+#, priority:220
+msgid "Changes the list of branches tracked by the named remote. This can be used to track a subset of the available remote branches after the initial setup for a remote."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
-msgid ""
-"The named branches will be interpreted as if specified with the `-t` option "
-"on the 'git remote add' command line."
+#, priority:220
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:134
-msgid ""
-"With `--add`, instead of replacing the list of currently tracked branches, "
-"adds to that list."
+#, priority:220
+msgid "With `--add`, instead of replacing the list of currently tracked branches, adds to that list."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:135
-#, no-wrap
+#, no-wrap, priority:220
msgid "'get-url'"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:139
-msgid ""
-"Retrieves the URLs for a remote. Configurations for `insteadOf` and "
-"`pushInsteadOf` are expanded here. By default, only the first URL is listed."
+#, priority:220
+msgid "Retrieves the URLs for a remote. Configurations for `insteadOf` and `pushInsteadOf` are expanded here. By default, only the first URL is listed."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:141
+#, priority:220
msgid "With `--push`, push URLs are queried rather than fetch URLs."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:143
+#, priority:220
msgid "With `--all`, all URLs for the remote will be listed."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:144
-#, no-wrap
+#, no-wrap, priority:220
msgid "'set-url'"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:149
-msgid ""
-"Changes URLs for the remote. Sets first URL for remote <name> that matches "
-"regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If <oldurl> "
-"doesn't match any URL, an error occurs and nothing is changed."
+#, priority:220
+msgid "Changes URLs for the remote. Sets first URL for remote <name> that matches regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If <oldurl> doesn't match any URL, an error occurs and nothing is changed."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:151
+#, priority:220
msgid "With `--push`, push URLs are manipulated instead of fetch URLs."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:153
+#, priority:220
msgid "With `--add`, instead of changing existing URLs, new URL is added."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:157
-msgid ""
-"With `--delete`, instead of changing existing URLs, all URLs matching regex "
-"<url> are deleted for remote <name>. Trying to delete all non-push URLs is "
-"an error."
+#, priority:220
+msgid "With `--delete`, instead of changing existing URLs, all URLs matching regex <url> are deleted for remote <name>. Trying to delete all non-push URLs is an error."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:164
-msgid ""
-"Note that the push URL and the fetch URL, even though they can be set "
-"differently, must still refer to the same place. What you pushed to the "
-"push URL should be what you would see if you immediately fetched from the "
-"fetch URL. If you are trying to fetch from one place (e.g. your upstream) "
-"and push to another (e.g. your publishing repository), use two separate "
-"remotes."
+#, priority:220
+msgid "Note that the push URL and the fetch URL, even though they can be set differently, must still refer to the same place. What you pushed to the push URL should be what you would see if you immediately fetched from the fetch URL. If you are trying to fetch from one place (e.g. your upstream) and push to another (e.g. your publishing repository), use two separate remotes."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:166
-#, no-wrap
+#, no-wrap, priority:220
msgid "'show'"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:169
+#, priority:220
msgid "Gives some information about the remote <name>."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:172
-msgid ""
-"With `-n` option, the remote heads are not queried first with `git ls-remote "
-"<name>`; cached information is used instead."
+#, priority:220
+msgid "With `-n` option, the remote heads are not queried first with `git ls-remote <name>`; cached information is used instead."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:173
-#, no-wrap
+#, no-wrap, priority:220
msgid "'prune'"
msgstr ""
#. type: Plain text
#: en/git-remote.txt:180
-msgid ""
-"Deletes stale references associated with <name>. By default, stale "
-"remote-tracking branches under <name> are deleted, but depending on global "
-"configuration and the configuration of the remote we might even prune local "
-"tags that haven't been pushed there. Equivalent to `git fetch --prune "
-"<name>`, except that no new references will be fetched."
+#, priority:220
+msgid "Deletes stale references associated with <name>. By default, stale remote-tracking branches under <name> are deleted, but depending on global configuration and the configuration of the remote we might even prune local tags that haven't been pushed there. Equivalent to `git fetch --prune <name>`, except that no new references will be fetched."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:183
-msgid ""
-"See the PRUNING section of linkgit:git-fetch[1] for what it'll prune "
-"depending on various configuration."
+#, priority:220
+msgid "See the PRUNING section of linkgit:git-fetch[1] for what it'll prune depending on various configuration."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
-msgid ""
-"With `--dry-run` option, report what branches will be pruned, but do not "
-"actually prune them."
+#, priority:220
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
#: en/git-remote.txt:187
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "'update'"
msgstr "update"
#. type: Plain text
#: en/git-remote.txt:195
-msgid ""
-"Fetch updates for remotes or remote groups in the repository as defined by "
-"remotes.<group>. If neither group nor remote is specified on the command "
-"line, the configuration parameter remotes.default will be used; if "
-"remotes.default is not defined, all remotes which do not have the "
-"configuration parameter remote.<name>.skipDefaultUpdate set to true will be "
-"updated. (See linkgit:git-config[1])."
+#, priority:220
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated. (See linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:197
+#, priority:220
msgid "With `--prune` option, run pruning against all the remotes that are updated."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:205
-msgid ""
-"The remote configuration is achieved using the `remote.origin.url` and "
-"`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
+#, priority:220
+msgid "The remote configuration is achieved using the `remote.origin.url` and `remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:210
+#, priority:220
msgid "Add a new remote, fetch, and check out a branch from it"
msgstr ""
#. type: delimited block -
#: en/git-remote.txt:235
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"$ git remote\n"
"origin\n"
@@ -48133,12 +41232,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:238
+#, priority:220
msgid "Imitate 'git clone' but track only selected branches"
msgstr ""
#. type: delimited block -
#: en/git-remote.txt:245
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"$ mkdir project.git\n"
"$ cd project.git\n"
@@ -48155,247 +41255,176 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-repack.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-repack(1)"
msgstr "git-repack(1)"
#. type: Plain text
#: en/git-repack.txt:7
+#, priority:100
msgid "git-repack - Pack unpacked objects in a repository"
msgstr ""
#. type: Plain text
#: en/git-repack.txt:13
-#, no-wrap
-msgid ""
-"'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] "
-"[--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
+#, no-wrap, priority:100
+msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
msgstr ""
#. type: Plain text
#: en/git-repack.txt:20
-msgid ""
-"This command is used to combine all objects that do not currently reside in "
-"a \"pack\", into a pack. It can also be used to re-organize existing packs "
-"into a single, more efficient pack."
+#, priority:100
+msgid "This command is used to combine all objects that do not currently reside in a \"pack\", into a pack. It can also be used to re-organize existing packs into a single, more efficient pack."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:39
-msgid ""
-"Instead of incrementally packing the unpacked objects, pack everything "
-"referenced into a single pack. Especially useful when packing a repository "
-"that is used for private development. Use with `-d`. This will clean up the "
-"objects that `git prune` leaves behind, but `git fsck --full --dangling` "
-"shows as dangling."
+#, priority:100
+msgid "Instead of incrementally packing the unpacked objects, pack everything referenced into a single pack. Especially useful when packing a repository that is used for private development. Use with `-d`. This will clean up the objects that `git prune` leaves behind, but `git fsck --full --dangling` shows as dangling."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:43
-msgid ""
-"Note that users fetching over dumb protocols will have to fetch the whole "
-"new pack in order to get any contained object, no matter how many other "
-"objects in that pack they already have locally."
+#, priority:100
+msgid "Note that users fetching over dumb protocols will have to fetch the whole new pack in order to get any contained object, no matter how many other objects in that pack they already have locally."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:48
-msgid ""
-"Promisor packfiles are repacked separately: if there are packfiles that have "
-"an associated \".promisor\" file, these packfiles will be repacked into "
-"another separate pack, and an empty \".promisor\" file corresponding to the "
-"new separate pack will be written."
+#, priority:100
+msgid "Promisor packfiles are repacked separately: if there are packfiles that have an associated \".promisor\" file, these packfiles will be repacked into another separate pack, and an empty \".promisor\" file corresponding to the new separate pack will be written."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:59
-msgid ""
-"Same as `-a`, unless `-d` is used. Then any unreachable objects in a "
-"previous pack become loose, unpacked objects, instead of being left in the "
-"old pack. Unreachable objects are never intentionally added to a pack, even "
-"when repacking. This option prevents unreachable objects from being "
-"immediately deleted by way of being left in the old pack and then removed. "
-"Instead, the loose unreachable objects will be pruned according to normal "
-"expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]."
+#, priority:100
+msgid "Same as `-a`, unless `-d` is used. Then any unreachable objects in a previous pack become loose, unpacked objects, instead of being left in the old pack. Unreachable objects are never intentionally added to a pack, even when repacking. This option prevents unreachable objects from being immediately deleted by way of being left in the old pack and then removed. Instead, the loose unreachable objects will be pruned according to normal expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:65
-msgid ""
-"After packing, if the newly created packs make some existing packs "
-"redundant, remove the redundant packs. Also run 'git prune-packed' to "
-"remove redundant loose object files."
+#, priority:100
+msgid "After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. Also run 'git prune-packed' to remove redundant loose object files."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:69
-msgid ""
-"Pass the `--local` option to 'git pack-objects'. See "
-"linkgit:git-pack-objects[1]."
+#, priority:100
+msgid "Pass the `--local` option to 'git pack-objects'. See linkgit:git-pack-objects[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:73
-msgid ""
-"Pass the `--no-reuse-delta` option to `git-pack-objects`, see "
-"linkgit:git-pack-objects[1]."
+#, priority:100
+msgid "Pass the `--no-reuse-delta` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:77
-msgid ""
-"Pass the `--no-reuse-object` option to `git-pack-objects`, see "
-"linkgit:git-pack-objects[1]."
+#, priority:100
+msgid "Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:81
+#, priority:100
msgid "Pass the `-q` option to 'git pack-objects'. See linkgit:git-pack-objects[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:88
-msgid ""
-"Do not update the server information with 'git update-server-info'. This "
-"option skips updating local catalog files needed to publish this repository "
-"(or a direct copy of it) over HTTP or FTP. See "
-"linkgit:git-update-server-info[1]."
+#, priority:100
+msgid "Do not update the server information with 'git update-server-info'. This option skips updating local catalog files needed to publish this repository (or a direct copy of it) over HTTP or FTP. See linkgit:git-update-server-info[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:98
-msgid ""
-"These two options affect how the objects contained in the pack are stored "
-"using delta compression. The objects are first internally sorted by type, "
-"size and optionally names and compared against the other objects within "
-"`--window` to see if using delta compression saves space. `--depth` limits "
-"the maximum delta depth; making it too deep affects the performance on the "
-"unpacker side, because delta data needs to be applied that many times to get "
-"to the necessary object."
+#, priority:100
+msgid "These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the other objects within `--window` to see if using delta compression saves space. `--depth` limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:104
+#, priority:100
msgid "This option is passed through to `git pack-objects`."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:117
-msgid ""
-"This option provides an additional limit on top of `--window`; the window "
-"size will dynamically scale down so as to not take up more than '<n>' bytes "
-"in memory. This is useful in repositories with a mix of large and small "
-"objects to not run out of memory with a large window, but still be able to "
-"take advantage of the large window for the smaller objects. The size can be "
-"suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
-"usage unlimited. The default is taken from the `pack.windowMemory` "
-"configuration variable. Note that the actual memory usage will be the limit "
-"multiplied by the number of threads used by linkgit:git-pack-objects[1]."
+#, priority:100
+msgid "This option provides an additional limit on top of `--window`; the window size will dynamically scale down so as to not take up more than '<n>' bytes in memory. This is useful in repositories with a mix of large and small objects to not run out of memory with a large window, but still be able to take advantage of the large window for the smaller objects. The size can be suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory usage unlimited. The default is taken from the `pack.windowMemory` configuration variable. Note that the actual memory usage will be the limit multiplied by the number of threads used by linkgit:git-pack-objects[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:125
-msgid ""
-"Maximum size of each output pack file. The size can be suffixed with \"k\", "
-"\"m\", or \"g\". The minimum size allowed is limited to 1 MiB. If "
-"specified, multiple packfiles may be created, which also prevents the "
-"creation of a bitmap index. The default is unlimited, unless the config "
-"variable `pack.packSizeLimit` is set."
+#, priority:100
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB. If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index. The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:127
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--write-bitmap-index"
msgstr "--write-bitmap-index"
#. type: Plain text
#: en/git-repack.txt:133
-msgid ""
-"Write a reachability bitmap index as part of the repack. This only makes "
-"sense when used with `-a` or `-A`, as the bitmaps must be able to refer to "
-"all reachable objects. This option overrides the setting of "
-"`repack.writeBitmaps`. This option has no effect if multiple packfiles are "
-"created."
+#, priority:100
+msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`. This option has no effect if multiple packfiles are created."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:134
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--pack-kept-objects"
msgstr "--pack-kept-objects"
#. type: Plain text
#: en/git-repack.txt:142
-msgid ""
-"Include objects in `.keep` files when repacking. Note that we still do not "
-"delete `.keep` packs after `pack-objects` finishes. This means that we may "
-"duplicate objects, but this makes the option safe to use when there are "
-"concurrent pushes or fetches. This option is generally only useful if you "
-"are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that "
-"the bitmapped packfile has the necessary objects."
+#, priority:100
+msgid "Include objects in `.keep` files when repacking. Note that we still do not delete `.keep` packs after `pack-objects` finishes. This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches. This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:149
-msgid ""
-"Exclude the given pack from repacking. This is the equivalent of having "
-"`.keep` file on the pack. `<pack-name>` is the pack file name without "
-"leading directory (e.g. `pack-123.pack`). The option could be specified "
-"multiple times to keep multiple packs."
+#, priority:100
+msgid "Exclude the given pack from repacking. This is the equivalent of having `.keep` file on the pack. `<pack-name>` is the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple packs."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:150
-#, no-wrap
+#, no-wrap, priority:100
msgid "--unpack-unreachable=<when>"
msgstr ""
#. type: Plain text
#: en/git-repack.txt:155
-msgid ""
-"When loosening unreachable objects, do not bother loosening any objects "
-"older than `<when>`. This can be used to optimize out the write of any "
-"objects that would be immediately pruned by a follow-up `git prune`."
+#, priority:100
+msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:162
-msgid ""
-"When used with `-ad`, any unreachable objects from existing packs will be "
-"appended to the end of the packfile instead of being removed. In addition, "
-"any unreachable loose objects will be packed (and their loose counterparts "
-"removed)."
+#, priority:100
+msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:167
-msgid ""
-"Pass the `--delta-islands` option to `git-pack-objects`, see "
-"linkgit:git-pack-objects[1]."
+#, priority:100
+msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr ""
#. type: Title -
#: en/git-repack.txt:169
-#, no-wrap
+#, no-wrap, priority:100
msgid "Configuration"
msgstr ""
#. type: Plain text
#: en/git-repack.txt:180
-msgid ""
-"By default, the command passes `--delta-base-offset` option to 'git "
-"pack-objects'; this typically results in slightly smaller packs, but the "
-"generated packs are incompatible with versions of Git older than version "
-"1.4.4. If you need to share your repository with such ancient Git versions, "
-"either directly or via the dumb http protocol, then you need to set the "
-"configuration variable `repack.UseDeltaBaseOffset` to \"false\" and "
-"repack. Access from old Git versions over the native protocol is unaffected "
-"by this option as the conversion is performed on the fly as needed in that "
-"case."
+#, priority:100
+msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
msgstr ""
#. type: Plain text
@@ -48406,20 +41435,19 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-replace.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-replace(1)"
msgstr "git-replace(1)"
#. type: Plain text
#: en/git-replace.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-replace - Create, list, delete refs to replace objects"
msgstr "Crea, lista, borra referencias para reemplazar objetos"
#. type: Plain text
#: en/git-replace.txt:17
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git replace' [-f] <object> <replacement>\n"
"'git replace' [-f] --edit <object>\n"
@@ -48431,565 +41459,499 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:21
+#, priority:100
msgid "Adds a 'replace' reference in `refs/replace/` namespace."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:25
-msgid ""
-"The name of the 'replace' reference is the SHA-1 of the object that is "
-"replaced. The content of the 'replace' reference is the SHA-1 of the "
-"replacement object."
+#, priority:100
+msgid "The name of the 'replace' reference is the SHA-1 of the object that is replaced. The content of the 'replace' reference is the SHA-1 of the replacement object."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:28
-msgid ""
-"The replaced object and the replacement object must be of the same type. "
-"This restriction can be bypassed using `-f`."
+#, priority:100
+msgid "The replaced object and the replacement object must be of the same type. This restriction can be bypassed using `-f`."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:30
+#, priority:100
msgid "Unless `-f` is given, the 'replace' reference must not yet exist."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:33
-msgid ""
-"There is no other restriction on the replaced and replacement objects. "
-"Merge commits can be replaced by non-merge commits and vice versa."
+#, priority:100
+msgid "There is no other restriction on the replaced and replacement objects. Merge commits can be replaced by non-merge commits and vice versa."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:37
-msgid ""
-"Replacement references will be used by default by all Git commands except "
-"those doing reachability traversal (prune, pack transfer and fsck)."
+#, priority:100
+msgid "Replacement references will be used by default by all Git commands except those doing reachability traversal (prune, pack transfer and fsck)."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:40
-msgid ""
-"It is possible to disable use of replacement references for any command "
-"using the `--no-replace-objects` option just after 'git'."
+#, priority:100
+msgid "It is possible to disable use of replacement references for any command using the `--no-replace-objects` option just after 'git'."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:42
+#, priority:100
msgid "For example if commit 'foo' has been replaced by commit 'bar':"
msgstr ""
#. type: delimited block -
#: en/git-replace.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git --no-replace-objects cat-file commit foo\n"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:48
+#, priority:100
msgid "shows information about commit 'foo', while:"
msgstr ""
#. type: delimited block -
#: en/git-replace.txt:51
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git cat-file commit foo\n"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:54
+#, priority:100
msgid "shows information about commit 'bar'."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:57
-msgid ""
-"The `GIT_NO_REPLACE_OBJECTS` environment variable can be set to achieve the "
-"same effect as the `--no-replace-objects` option."
+#, priority:100
+msgid "The `GIT_NO_REPLACE_OBJECTS` environment variable can be set to achieve the same effect as the `--no-replace-objects` option."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:64
-msgid ""
-"If an existing replace ref for the same object exists, it will be "
-"overwritten (instead of failing)."
+#, priority:100
+msgid "If an existing replace ref for the same object exists, it will be overwritten (instead of failing)."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:68
+#, priority:100
msgid "Delete existing replace refs for the given objects."
msgstr ""
#. type: Labeled list
#: en/git-replace.txt:69
-#, no-wrap
+#, no-wrap, priority:100
msgid "--edit <object>"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:77
-msgid ""
-"Edit an object's content interactively. The existing content for <object> is "
-"pretty-printed into a temporary file, an editor is launched on the file, and "
-"the result is parsed to create a new object of the same type as <object>. A "
-"replacement ref is then created to replace <object> with the newly created "
-"object. See linkgit:git-var[1] for details about how the editor will be "
-"chosen."
+#, priority:100
+msgid "Edit an object's content interactively. The existing content for <object> is pretty-printed into a temporary file, an editor is launched on the file, and the result is parsed to create a new object of the same type as <object>. A replacement ref is then created to replace <object> with the newly created object. See linkgit:git-var[1] for details about how the editor will be chosen."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:85
-msgid ""
-"When editing, provide the raw object contents rather than pretty-printed "
-"ones. Currently this only affects trees, which will be shown in their binary "
-"form. This is harder to work with, but can help when repairing a tree that "
-"is so corrupted it cannot be pretty-printed. Note that you may need to "
-"configure your editor to cleanly read and write binary data."
+#, priority:100
+msgid "When editing, provide the raw object contents rather than pretty-printed ones. Currently this only affects trees, which will be shown in their binary form. This is harder to work with, but can help when repairing a tree that is so corrupted it cannot be pretty-printed. Note that you may need to configure your editor to cleanly read and write binary data."
msgstr ""
#. type: Labeled list
#: en/git-replace.txt:86
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--graft <commit> [<parent>...]"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:93
-msgid ""
-"Create a graft commit. A new commit is created with the same content as "
-"<commit> except that its parents will be [<parent>...] instead of <commit>'s "
-"parents. A replacement ref is then created to replace <commit> with the "
-"newly created commit. Use `--convert-graft-file` to convert a "
-"`$GIT_DIR/info/grafts` file and use replace refs instead."
+#, ignore-ellipsis, priority:100
+msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/grafts` file and use replace refs instead."
msgstr ""
#. type: Labeled list
#: en/git-replace.txt:94
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--convert-graft-file"
msgstr "--convert-graft-file"
#. type: Plain text
#: en/git-replace.txt:98
-msgid ""
-"Creates graft commits for all entries in `$GIT_DIR/info/grafts` and deletes "
-"that file upon success. The purpose is to help users with transitioning off "
-"of the now-deprecated graft file."
+#, priority:100
+msgid "Creates graft commits for all entries in `$GIT_DIR/info/grafts` and deletes that file upon success. The purpose is to help users with transitioning off of the now-deprecated graft file."
msgstr ""
#. type: Labeled list
#: en/git-replace.txt:99
-#, no-wrap
+#, no-wrap, priority:100
msgid "-l <pattern>"
msgstr ""
#. type: Labeled list
#: en/git-replace.txt:100
-#, no-wrap
+#, no-wrap, priority:100
msgid "--list <pattern>"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:105
-msgid ""
-"List replace refs for objects that match the given pattern (or all if no "
-"pattern is given). Typing \"git replace\" without arguments, also lists all "
-"replace refs."
+#, priority:100
+msgid "List replace refs for objects that match the given pattern (or all if no pattern is given). Typing \"git replace\" without arguments, also lists all replace refs."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:110
-msgid ""
-"When listing, use the specified <format>, which can be one of 'short', "
-"'medium' and 'long'. When omitted, the format defaults to 'short'."
+#, priority:100
+msgid "When listing, use the specified <format>, which can be one of 'short', 'medium' and 'long'. When omitted, the format defaults to 'short'."
msgstr ""
#. type: Title -
#: en/git-replace.txt:112
-#, no-wrap
+#, no-wrap, priority:100
msgid "FORMATS"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:115
+#, priority:100
msgid "The following format are available:"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:117
-#, fuzzy
+#, fuzzy, priority:100
msgid "'short':"
msgstr "'short'"
#. type: Plain text
#: en/git-replace.txt:118
+#, priority:100
msgid "<replaced sha1>"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:119
-#, fuzzy
+#, fuzzy, priority:100
msgid "'medium':"
msgstr "'medium'"
#. type: Plain text
#: en/git-replace.txt:120
+#, priority:100
msgid "<replaced sha1> -> <replacement sha1>"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:121
+#, priority:100
msgid "'long':"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:122
+#, priority:100
msgid "<replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>)"
msgstr ""
#. type: Title -
#: en/git-replace.txt:124
-#, no-wrap
+#, no-wrap, priority:100
msgid "CREATING REPLACEMENT OBJECTS"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:131
-msgid ""
-"linkgit:git-hash-object[1], linkgit:git-rebase[1], and "
-"https://github.com/newren/git-filter-repo[git-filter-repo], among other git "
-"commands, can be used to create replacement objects from existing "
-"objects. The `--edit` option can also be used with 'git replace' to create a "
-"replacement object by editing an existing object."
+#, priority:100
+msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:137
-msgid ""
-"If you want to replace many blobs, trees or commits that are part of a "
-"string of commits, you may just want to create a replacement string of "
-"commits and then only replace the commit at the tip of the target string of "
-"commits with the commit at the tip of the replacement string of commits."
+#, priority:100
+msgid "If you want to replace many blobs, trees or commits that are part of a string of commits, you may just want to create a replacement string of commits and then only replace the commit at the tip of the target string of commits with the commit at the tip of the replacement string of commits."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:144
-msgid ""
-"Comparing blobs or trees that have been replaced with those that replace "
-"them will not work properly. And using `git reset --hard` to go back to a "
-"replaced commit will move the branch to the replacement commit instead of "
-"the replaced commit."
+#, priority:100
+msgid "Comparing blobs or trees that have been replaced with those that replace them will not work properly. And using `git reset --hard` to go back to a replaced commit will move the branch to the replacement commit instead of the replaced commit."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:147
-msgid ""
-"There may be other problems when using 'git rev-list' related to pending "
-"objects."
+#, priority:100
+msgid "There may be other problems when using 'git rev-list' related to pending objects."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-msgid ""
-"linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] "
-"linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] "
-"linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
+#, priority:100
+msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
msgstr ""
#. type: Title =
#: en/git-request-pull.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-request-pull(1)"
msgstr "git-request-pull(1)"
#. type: Plain text
#: en/git-request-pull.txt:7
+#, priority:100
msgid "git-request-pull - Generates a summary of pending changes"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git request-pull' [-p] <start> <url> [<end>]\n"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:20
-msgid ""
-"Generate a request asking your upstream project to pull changes into their "
-"tree. The request, printed to the standard output, begins with the branch "
-"description, summarizes the changes and indicates from where they can be "
-"pulled."
+#, priority:100
+msgid "Generate a request asking your upstream project to pull changes into their tree. The request, printed to the standard output, begins with the branch description, summarizes the changes and indicates from where they can be pulled."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:25
-msgid ""
-"The upstream project is expected to have the commit named by `<start>` and "
-"the output asks it to integrate the changes you made since that commit, up "
-"to the commit named by `<end>`, by visiting the repository named by `<url>`."
+#, priority:100
+msgid "The upstream project is expected to have the commit named by `<start>` and the output asks it to integrate the changes you made since that commit, up to the commit named by `<end>`, by visiting the repository named by `<url>`."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:31
+#, priority:100
msgid "Include patch text in the output."
msgstr ""
#. type: Labeled list
#: en/git-request-pull.txt:32
-#, no-wrap
+#, no-wrap, priority:100
msgid "<start>"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:35
-msgid ""
-"Commit to start at. This names a commit that is already in the upstream "
-"history."
+#, priority:100
+msgid "Commit to start at. This names a commit that is already in the upstream history."
msgstr ""
#. type: Labeled list
#: en/git-request-pull.txt:36
-#, no-wrap
+#, no-wrap, priority:100
msgid "<url>"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:38
+#, priority:100
msgid "The repository URL to be pulled from."
msgstr ""
#. type: Labeled list
#: en/git-request-pull.txt:39
-#, no-wrap
+#, no-wrap, priority:100
msgid "<end>"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:42
-msgid ""
-"Commit to end at (defaults to HEAD). This names the commit at the tip of "
-"the history you are asking to be pulled."
+#, priority:100
+msgid "Commit to end at (defaults to HEAD). This names the commit at the tip of the history you are asking to be pulled."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:47
-msgid ""
-"When the repository named by `<url>` has the commit at a tip of a ref that "
-"is different from the ref you have locally, you can use the "
-"`<local>:<remote>` syntax, to have its local name, a colon `:`, and its "
-"remote name."
+#, priority:100
+msgid "When the repository named by `<url>` has the commit at a tip of a ref that is different from the ref you have locally, you can use the `<local>:<remote>` syntax, to have its local name, a colon `:`, and its remote name."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:56
-msgid ""
-"Imagine that you built your work on your `master` branch on top of the "
-"`v1.0` release, and want it to be integrated to the project. First you push "
-"that change to your public repository for others to see:"
+#, priority:100
+msgid "Imagine that you built your work on your `master` branch on top of the `v1.0` release, and want it to be integrated to the project. First you push that change to your public repository for others to see:"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:58
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit push https://git.ko.xz/project master\n"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:60
+#, priority:100
msgid "Then, you run this command:"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:62
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit request-pull v1.0 https://git.ko.xz/project master\n"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:66
-msgid ""
-"which will produce a request to the upstream, summarizing the changes "
-"between the `v1.0` release and your `master`, to pull it from your public "
-"repository."
+#, priority:100
+msgid "which will produce a request to the upstream, summarizing the changes between the `v1.0` release and your `master`, to pull it from your public repository."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:69
-msgid ""
-"If you pushed your change to a branch whose name is different from the one "
-"you have locally, e.g."
+#, priority:100
+msgid "If you pushed your change to a branch whose name is different from the one you have locally, e.g."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:71
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit push https://git.ko.xz/project master:for-linus\n"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:73
+#, priority:100
msgid "then you can ask that to be pulled with"
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:75
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit request-pull v1.0 https://git.ko.xz/project master:for-linus\n"
msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-rerere(1)"
msgstr "git-rerere(1)"
#. type: Plain text
#: en/git-rerere.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-rerere - Reuse recorded resolution of conflicted merges"
msgstr "Reutilizar la resoluci처n registrada de fusiones conflictivas"
#. type: Plain text
#: en/git-rerere.txt:12
-#, no-wrap
-msgid ""
-"'git rerere' ['clear'|'forget' "
-"<pathspec>|'diff'|'remaining'|'status'|'gc']\n"
+#, no-wrap, priority:100
+msgid "'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']\n"
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:20
-msgid ""
-"In a workflow employing relatively long lived topic branches, the developer "
-"sometimes needs to resolve the same conflicts over and over again until the "
-"topic branches are done (either merged to the \"release\" branch, or sent "
-"out and accepted upstream)."
+#, priority:100
+msgid "In a workflow employing relatively long lived topic branches, the developer sometimes needs to resolve the same conflicts over and over again until the topic branches are done (either merged to the \"release\" branch, or sent out and accepted upstream)."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:25
-msgid ""
-"This command assists the developer in this process by recording conflicted "
-"automerge results and corresponding hand resolve results on the initial "
-"manual merge, and applying previously recorded hand resolutions to their "
-"corresponding automerge results."
+#, priority:100
+msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:29
-msgid ""
-"You need to set the configuration variable `rerere.enabled` in order to "
-"enable this command."
+#, priority:100
+msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:37
-msgid ""
-"Normally, 'git rerere' is run without arguments or user-intervention. "
-"However, it has several commands that allow it to interact with its working "
-"state."
+#, priority:100
+msgid "Normally, 'git rerere' is run without arguments or user-intervention. However, it has several commands that allow it to interact with its working state."
msgstr ""
#. type: Labeled list
#: en/git-rerere.txt:38
-#, no-wrap
+#, no-wrap, priority:100
msgid "'clear'"
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:43
-msgid ""
-"Reset the metadata used by rerere if a merge resolution is to be aborted. "
-"Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will "
-"automatically invoke this command."
+#, priority:100
+msgid "Reset the metadata used by rerere if a merge resolution is to be aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will automatically invoke this command."
msgstr ""
#. type: Labeled list
#: en/git-rerere.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "'forget' <pathspec>"
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:48
-msgid ""
-"Reset the conflict resolutions which rerere has recorded for the current "
-"conflict in <pathspec>."
+#, priority:100
+msgid "Reset the conflict resolutions which rerere has recorded for the current conflict in <pathspec>."
msgstr ""
#. type: Labeled list
#: en/git-rerere.txt:49
-#, no-wrap
+#, no-wrap, priority:100
msgid "'diff'"
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:55
-msgid ""
-"Display diffs for the current state of the resolution. It is useful for "
-"tracking what has changed while the user is resolving conflicts. Additional "
-"arguments are passed directly to the system 'diff' command installed in "
-"PATH."
+#, priority:100
+msgid "Display diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system 'diff' command installed in PATH."
msgstr ""
#. type: Labeled list
#: en/git-rerere.txt:56
-#, no-wrap
+#, no-wrap, priority:100
msgid "'status'"
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:59
+#, priority:100
msgid "Print paths with conflicts whose merge resolution rerere will record."
msgstr ""
#. type: Labeled list
#: en/git-rerere.txt:60
-#, no-wrap
+#, no-wrap, priority:100
msgid "'remaining'"
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:65
-msgid ""
-"Print paths with conflicts that have not been autoresolved by rerere. This "
-"includes paths whose resolutions cannot be tracked by rerere, such as "
-"conflicting submodules."
+#, priority:100
+msgid "Print paths with conflicts that have not been autoresolved by rerere. This includes paths whose resolutions cannot be tracked by rerere, such as conflicting submodules."
msgstr ""
#. type: Labeled list
#: en/git-rerere.txt:66 en/git-svn.txt:511
-#, no-wrap
+#, no-wrap, priority:100
msgid "'gc'"
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:74
-msgid ""
-"Prune records of conflicted merges that occurred a long time ago. By "
-"default, unresolved conflicts older than 15 days and resolved conflicts "
-"older than 60 days are pruned. These defaults are controlled via the "
-"`gc.rerereUnresolved` and `gc.rerereResolved` configuration variables "
-"respectively."
+#, priority:100
+msgid "Prune records of conflicted merges that occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the `gc.rerereUnresolved` and `gc.rerereResolved` configuration variables respectively."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:83
-msgid ""
-"When your topic branch modifies an overlapping area that your master branch "
-"(or upstream) touched since your topic branch forked from it, you may want "
-"to test it with the latest master, even before your topic branch is ready to "
-"be pushed upstream:"
+#, priority:100
+msgid "When your topic branch modifies an overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, even before your topic branch is ready to be pushed upstream:"
msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:88
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---*---o topic\n"
" /\n"
@@ -48998,14 +41960,13 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:92
-msgid ""
-"For such a test, you need to merge master and topic somehow. One way to do "
-"it is to pull master into the topic branch:"
+#, priority:100
+msgid "For such a test, you need to merge master and topic somehow. One way to do it is to pull master into the topic branch:"
msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:96
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -49013,7 +41974,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:100
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---*---o---+ topic\n"
" / /\n"
@@ -49022,27 +41983,19 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:106
-msgid ""
-"The commits marked with `*` touch the same area in the same file; you need "
-"to resolve the conflicts when creating the commit marked with `+`. Then you "
-"can test the result to make sure your work-in-progress still works with what "
-"is in the latest master."
+#, priority:100
+msgid "The commits marked with `*` touch the same area in the same file; you need to resolve the conflicts when creating the commit marked with `+`. Then you can test the result to make sure your work-in-progress still works with what is in the latest master."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:114
-msgid ""
-"After this test merge, there are two ways to continue your work on the "
-"topic. The easiest is to build on top of the test merge commit `+`, and "
-"when your work in the topic branch is finally ready, pull the topic branch "
-"into master, and/or ask the upstream to pull from you. By that time, "
-"however, the master or the upstream might have been advanced since the test "
-"merge `+`, in which case the final commit graph would look like this:"
+#, priority:100
+msgid "After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge commit `+`, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or the upstream might have been advanced since the test merge `+`, in which case the final commit graph would look like this:"
msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:121
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -49053,7 +42006,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:125
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---*---o---+---o---o topic\n"
" / / \\\n"
@@ -49062,26 +42015,19 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:133
-msgid ""
-"When your topic branch is long-lived, however, your topic branch would end "
-"up having many such \"Merge from master\" commits on it, which would "
-"unnecessarily clutter the development history. Readers of the Linux kernel "
-"mailing list may remember that Linus complained about such too frequent test "
-"merges when a subsystem maintainer asked to pull from a branch full of "
-"\"useless merges\"."
+#, priority:100
+msgid "When your topic branch is long-lived, however, your topic branch would end up having many such \"Merge from master\" commits on it, which would unnecessarily clutter the development history. Readers of the Linux kernel mailing list may remember that Linus complained about such too frequent test merges when a subsystem maintainer asked to pull from a branch full of \"useless merges\"."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:137
-msgid ""
-"As an alternative, to keep the topic branch clean of test merges, you could "
-"blow away the test merge, and keep building on top of the tip before the "
-"test merge:"
+#, priority:100
+msgid "As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on top of the tip before the test merge:"
msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:145
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -49093,7 +42039,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:149
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---*---o-------o---o topic\n"
" / \\\n"
@@ -49102,70 +42048,43 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:159
-msgid ""
-"This would leave only one merge commit when your topic branch is finally "
-"ready and merged into the master branch. This merge would require you to "
-"resolve the conflict, introduced by the commits marked with `*`. However, "
-"this conflict is often the same conflict you resolved when you created the "
-"test merge you blew away. 'git rerere' helps you resolve this final "
-"conflicted merge using the information from your earlier hand resolve."
+#, priority:100
+msgid "This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the commits marked with `*`. However, this conflict is often the same conflict you resolved when you created the test merge you blew away. 'git rerere' helps you resolve this final conflicted merge using the information from your earlier hand resolve."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:167
-msgid ""
-"Running the 'git rerere' command immediately after a conflicted automerge "
-"records the conflicted working tree files, with the usual conflict markers "
-"`<<<<<<<`, `=======`, and `>>>>>>>` in them. Later, after you are done "
-"resolving the conflicts, running 'git rerere' again will record the resolved "
-"state of these files. Suppose you did this when you created the test merge "
-"of master into the topic branch."
+#, priority:100
+msgid "Running the 'git rerere' command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers `<<<<<<<`, `=======`, and `>>>>>>>` in them. Later, after you are done resolving the conflicts, running 'git rerere' again will record the resolved state of these files. Suppose you did this when you created the test merge of master into the topic branch."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:177
-msgid ""
-"Next time, after seeing the same conflicted automerge, running 'git rerere' "
-"will perform a three-way merge between the earlier conflicted automerge, the "
-"earlier manual resolution, and the current conflicted automerge. If this "
-"three-way merge resolves cleanly, the result is written out to your working "
-"tree file, so you do not have to manually resolve it. Note that 'git "
-"rerere' leaves the index file alone, so you still need to do the final "
-"sanity checks with `git diff` (or `git diff -c`) and 'git add' when you are "
-"satisfied."
+#, priority:100
+msgid "Next time, after seeing the same conflicted automerge, running 'git rerere' will perform a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge. If this three-way merge resolves cleanly, the result is written out to your working tree file, so you do not have to manually resolve it. Note that 'git rerere' leaves the index file alone, so you still need to do the final sanity checks with `git diff` (or `git diff -c`) and 'git add' when you are satisfied."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:185
-msgid ""
-"As a convenience measure, 'git merge' automatically invokes 'git rerere' "
-"upon exiting with a failed automerge and 'git rerere' records the hand "
-"resolve when it is a new conflict, or reuses the earlier hand resolve when "
-"it is not. 'git commit' also invokes 'git rerere' when committing a merge "
-"result. What this means is that you do not have to do anything special "
-"yourself (besides enabling the rerere.enabled config variable)."
+#, priority:100
+msgid "As a convenience measure, 'git merge' automatically invokes 'git rerere' upon exiting with a failed automerge and 'git rerere' records the hand resolve when it is a new conflict, or reuses the earlier hand resolve when it is not. 'git commit' also invokes 'git rerere' when committing a merge result. What this means is that you do not have to do anything special yourself (besides enabling the rerere.enabled config variable)."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:190
-msgid ""
-"In our example, when you do the test merge, the manual resolution is "
-"recorded, and it will be reused when you do the actual merge later with the "
-"updated master and topic branch, as long as the recorded resolution is still "
-"applicable."
+#, priority:100
+msgid "In our example, when you do the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with the updated master and topic branch, as long as the recorded resolution is still applicable."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:194
-msgid ""
-"The information 'git rerere' records is also used when running 'git "
-"rebase'. After blowing away the test merge and continuing development on "
-"the topic branch:"
+#, priority:100
+msgid "The information 'git rerere' records is also used when running 'git rebase'. After blowing away the test merge and continuing development on the topic branch:"
msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:199
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" o---*---o-------o---o topic\n"
" /\n"
@@ -49174,13 +42093,13 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:201
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t$ git rebase master topic\n"
msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:205
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t\t\t\t o---*---o-------o---o topic\n"
"\t\t\t\t /\n"
@@ -49189,243 +42108,191 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:213
-msgid ""
-"you could run `git rebase master topic`, to bring yourself up to date before "
-"your topic is ready to be sent upstream. This would result in falling back "
-"to a three-way merge, and it would conflict the same way as the test merge "
-"you resolved earlier. 'git rerere' will be run by 'git rebase' to help you "
-"resolve this conflict."
+#, priority:100
+msgid "you could run `git rebase master topic`, to bring yourself up to date before your topic is ready to be sent upstream. This would result in falling back to a three-way merge, and it would conflict the same way as the test merge you resolved earlier. 'git rerere' will be run by 'git rebase' to help you resolve this conflict."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:219
-msgid ""
-"[NOTE] 'git rerere' relies on the conflict markers in the file to detect the "
-"conflict. If the file already contains lines that look the same as lines "
-"with conflict markers, 'git rerere' may fail to record a conflict "
-"resolution. To work around this, the `conflict-marker-size` setting in "
-"linkgit:gitattributes[5] can be used."
+#, priority:100
+msgid "[NOTE] 'git rerere' relies on the conflict markers in the file to detect the conflict. If the file already contains lines that look the same as lines with conflict markers, 'git rerere' may fail to record a conflict resolution. To work around this, the `conflict-marker-size` setting in linkgit:gitattributes[5] can be used."
msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "git-reset(1)"
msgstr "git-reset(1)"
#. type: Plain text
#: en/git-reset.txt:7
-#, fuzzy
+#, fuzzy, priority:280
msgid "git-reset - Reset current HEAD to the specified state"
msgstr "Reinicia el HEAD actual a un estado especifico"
#. type: Plain text
#: en/git-reset.txt:15
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git reset' [-q] [<tree-ish>] [--] <pathspec>...\n"
-"'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] "
-"[<tree-ish>]\n"
+"'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]\n"
"'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]\n"
-"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] "
-"[<commit>]\n"
+"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:22
-msgid ""
-"In the first three forms, copy entries from `<tree-ish>` to the index. In "
-"the last form, set the current branch head (`HEAD`) to `<commit>`, "
-"optionally modifying index and working tree to match. The "
-"`<tree-ish>`/`<commit>` defaults to `HEAD` in all forms."
+#, priority:280
+msgid "In the first three forms, copy entries from `<tree-ish>` to the index. In the last form, set the current branch head (`HEAD`) to `<commit>`, optionally modifying index and working tree to match. The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:23
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<찼rbol-ismo>] [--] <pathspec>..."
#. type: Labeled list
#: en/git-reset.txt:24
-#, fuzzy, no-wrap
-msgid ""
-"'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] "
-"[<tree-ish>]"
-msgstr ""
-"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<찼rbol-ismo>]"
+#, fuzzy, no-wrap, priority:280
+msgid "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]"
+msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<찼rbol-ismo>]"
#. type: Plain text
#: en/git-reset.txt:28
-msgid ""
-"These forms reset the index entries for all paths that match the "
-"`<pathspec>` to their state at `<tree-ish>`. (It does not affect the "
-"working tree or the current branch.)"
+#, priority:280
+msgid "These forms reset the index entries for all paths that match the `<pathspec>` to their state at `<tree-ish>`. (It does not affect the working tree or the current branch.)"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:32
-msgid ""
-"This means that `git reset <pathspec>` is the opposite of `git add "
-"<pathspec>`. This command is equivalent to `git restore "
-"[--source=<tree-ish>] --staged <pathspec>...`."
+#, ignore-ellipsis, priority:280
+msgid "This means that `git reset <pathspec>` is the opposite of `git add <pathspec>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <pathspec>...`."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:39
-msgid ""
-"After running `git reset <pathspec>` to update the index entry, you can use "
-"linkgit:git-restore[1] to check the contents out of the index to the working "
-"tree. Alternatively, using linkgit:git-restore[1] and specifying a commit "
-"with `--source`, you can copy the contents of a path out of a commit to the "
-"index and to the working tree in one go."
+#, priority:280
+msgid "After running `git reset <pathspec>` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:40
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<찼rbol-ismo>] [--] [<pathspec>...]"
#. type: Plain text
#: en/git-reset.txt:44
-msgid ""
-"Interactively select hunks in the difference between the index and "
-"`<tree-ish>` (defaults to `HEAD`). The chosen hunks are applied in reverse "
-"to the index."
+#, priority:280
+msgid "Interactively select hunks in the difference between the index and `<tree-ish>` (defaults to `HEAD`). The chosen hunks are applied in reverse to the index."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:48
-msgid ""
-"This means that `git reset -p` is the opposite of `git add -p`, i.e. you "
-"can use it to selectively reset hunks. See the ``Interactive Mode'' section "
-"of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+#, priority:280
+msgid "This means that `git reset -p` is the opposite of `git add -p`, i.e. you can use it to selectively reset hunks. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:49
-#, no-wrap
+#, no-wrap, priority:280
msgid "'git reset' [<mode>] [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:54
-msgid ""
-"This form resets the current branch head to `<commit>` and possibly updates "
-"the index (resetting it to the tree of `<commit>`) and the working tree "
-"depending on `<mode>`. If `<mode>` is omitted, defaults to `--mixed`. The "
-"`<mode>` must be one of the following:"
+#, priority:280
+msgid "This form resets the current branch head to `<commit>` and possibly updates the index (resetting it to the tree of `<commit>`) and the working tree depending on `<mode>`. If `<mode>` is omitted, defaults to `--mixed`. The `<mode>` must be one of the following:"
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:56
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--soft"
msgstr "--soft"
#. type: Plain text
#: en/git-reset.txt:61
-msgid ""
-"Does not touch the index file or the working tree at all (but resets the "
-"head to `<commit>`, just like all modes do). This leaves all your changed "
-"files \"Changes to be committed\", as `git status` would put it."
+#, priority:280
+msgid "Does not touch the index file or the working tree at all (but resets the head to `<commit>`, just like all modes do). This leaves all your changed files \"Changes to be committed\", as `git status` would put it."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:62
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--mixed"
msgstr "--mixed"
#. type: Plain text
#: en/git-reset.txt:66
-msgid ""
-"Resets the index but not the working tree (i.e., the changed files are "
-"preserved but not marked for commit) and reports what has not been "
-"updated. This is the default action."
+#, priority:280
+msgid "Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:69
-msgid ""
-"If `-N` is specified, removed paths are marked as intent-to-add (see "
-"linkgit:git-add[1])."
+#, priority:280
+msgid "If `-N` is specified, removed paths are marked as intent-to-add (see linkgit:git-add[1])."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:70
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--hard"
msgstr "--hard"
#. type: Plain text
#: en/git-reset.txt:73
-msgid ""
-"Resets the index and working tree. Any changes to tracked files in the "
-"working tree since `<commit>` are discarded."
+#, priority:280
+msgid "Resets the index and working tree. Any changes to tracked files in the working tree since `<commit>` are discarded."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:81
-msgid ""
-"Resets the index and updates the files in the working tree that are "
-"different between `<commit>` and `HEAD`, but keeps those which are different "
-"between the index and working tree (i.e. which have changes which have not "
-"been added). If a file that is different between `<commit>` and the index "
-"has unstaged changes, reset is aborted."
+#, priority:280
+msgid "Resets the index and updates the files in the working tree that are different between `<commit>` and `HEAD`, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between `<commit>` and the index has unstaged changes, reset is aborted."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:84
-msgid ""
-"In other words, `--merge` does something like a `git read-tree -u -m "
-"<commit>`, but carries forward unmerged index entries."
+#, priority:280
+msgid "In other words, `--merge` does something like a `git read-tree -u -m <commit>`, but carries forward unmerged index entries."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:90
-msgid ""
-"Resets index entries and updates files in the working tree that are "
-"different between `<commit>` and `HEAD`. If a file that is different "
-"between `<commit>` and `HEAD` has local changes, reset is aborted."
+#, priority:280
+msgid "Resets index entries and updates files in the working tree that are different between `<commit>` and `HEAD`. If a file that is different between `<commit>` and `HEAD` has local changes, reset is aborted."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:94 en/git-restore.txt:31 en/git-revert.txt:33
-msgid ""
-"See \"Reset, restore and revert\" in linkgit:git[1] for the differences "
-"between the three commands."
+#, priority:280
+msgid "See \"Reset, restore and revert\" in linkgit:git[1] for the differences between the three commands."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:101
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-quiet"
msgstr "--no-quiet"
#. type: Plain text
#: en/git-reset.txt:105
-msgid ""
-"Be quiet, only report errors. The default behavior is set by the "
-"`reset.quiet` config option. `--quiet` and `--no-quiet` will override the "
-"default behavior."
+#, priority:280
+msgid "Be quiet, only report errors. The default behavior is set by the `reset.quiet` config option. `--quiet` and `--no-quiet` will override the default behavior."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:130
-#, no-wrap
+#, no-wrap, priority:280
msgid "Undo add"
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:138
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"$ edit <1>\n"
"$ git add frotz.c filfre.c\n"
@@ -49436,43 +42303,37 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:144
-msgid ""
-"You are happily working on something, and find the changes in these files "
-"are in good order. You do not want to see them when you run `git diff`, "
-"because you plan to work on other files and changes with these files are "
-"distracting."
+#, priority:280
+msgid "You are happily working on something, and find the changes in these files are in good order. You do not want to see them when you run `git diff`, because you plan to work on other files and changes with these files are distracting."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:145
+#, priority:280
msgid "Somebody asks you to pull, and the changes sound worthy of merging."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:150
-msgid ""
-"However, you already dirtied the index (i.e. your index does not match the "
-"`HEAD` commit). But you know the pull you are going to make does not affect "
-"`frotz.c` or `filfre.c`, so you revert the index changes for these two "
-"files. Your changes in working tree remain there."
+#, priority:280
+msgid "However, you already dirtied the index (i.e. your index does not match the `HEAD` commit). But you know the pull you are going to make does not affect `frotz.c` or `filfre.c`, so you revert the index changes for these two files. Your changes in working tree remain there."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:152
-msgid ""
-"Then you can pull and merge, leaving `frotz.c` and `filfre.c` changes still "
-"in the working tree."
+#, priority:280
+msgid "Then you can pull and merge, leaving `frotz.c` and `filfre.c` changes still in the working tree."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:153
-#, no-wrap
+#, no-wrap, priority:280
msgid "Undo a commit and redo"
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:160
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
"$ git reset --soft HEAD^ <1>\n"
@@ -49482,39 +42343,37 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:165
-msgid ""
-"This is most often done when you remembered what you just committed is "
-"incomplete, or you misspelled your commit message, or both. Leaves working "
-"tree as it was before \"reset\"."
+#, priority:280
+msgid "This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before \"reset\"."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:166
+#, priority:280
msgid "Make corrections to working tree files."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:169
-msgid ""
-"\"reset\" copies the old head to `.git/ORIG_HEAD`; redo the commit by "
-"starting with its log message. If you do not need to edit the message "
-"further, you can give `-C` option instead."
+#, priority:280
+msgid "\"reset\" copies the old head to `.git/ORIG_HEAD`; redo the commit by starting with its log message. If you do not need to edit the message further, you can give `-C` option instead."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:171
+#, priority:280
msgid "See also the `--amend` option to linkgit:git-commit[1]."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:172
-#, no-wrap
+#, no-wrap, priority:280
msgid "Undo a commit, making it a topic branch"
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:178
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"$ git branch topic/wip <1>\n"
"$ git reset --hard HEAD~3 <2>\n"
@@ -49523,31 +42382,31 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:184
-msgid ""
-"You have made some commits, but realize they were premature to be in the "
-"`master` branch. You want to continue polishing them in a topic branch, so "
-"create `topic/wip` branch off of the current `HEAD`."
+#, priority:280
+msgid "You have made some commits, but realize they were premature to be in the `master` branch. You want to continue polishing them in a topic branch, so create `topic/wip` branch off of the current `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:185
+#, priority:280
msgid "Rewind the master branch to get rid of those three commits."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:186
+#, priority:280
msgid "Switch to `topic/wip` branch and keep working."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:187
-#, no-wrap
+#, no-wrap, priority:280
msgid "Undo commits permanently"
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:192
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
"$ git reset --hard HEAD~3 <1>\n"
@@ -49555,22 +42414,19 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:199
-msgid ""
-"The last three commits (`HEAD`, `HEAD^`, and `HEAD~2`) were bad and you do "
-"not want to ever see them again. Do *not* do this if you have already given "
-"these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM "
-"REBASE\" section in linkgit:git-rebase[1] for the implications of doing so.)"
+#, priority:280
+msgid "The last three commits (`HEAD`, `HEAD^`, and `HEAD~2`) were bad and you do not want to ever see them again. Do *not* do this if you have already given these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1] for the implications of doing so.)"
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:200
-#, no-wrap
+#, no-wrap, priority:280
msgid "Undo a merge or pull"
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:212
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
"Auto-merging nitfol\n"
@@ -49585,46 +42441,37 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:217
-msgid ""
-"Try to update from the upstream resulted in a lot of conflicts; you were not "
-"ready to spend a lot of time merging right now, so you decide to do that "
-"later."
+#, priority:280
+msgid "Try to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:220
-msgid ""
-"\"pull\" has not made merge commit, so `git reset --hard` which is a synonym "
-"for `git reset --hard HEAD` clears the mess from the index file and the "
-"working tree."
+#, priority:280
+msgid "\"pull\" has not made merge commit, so `git reset --hard` which is a synonym for `git reset --hard HEAD` clears the mess from the index file and the working tree."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:222
-msgid ""
-"Merge a topic branch into the current branch, which resulted in a "
-"fast-forward."
+#, priority:280
+msgid "Merge a topic branch into the current branch, which resulted in a fast-forward."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:227
-msgid ""
-"But you decided that the topic branch is not ready for public consumption "
-"yet. \"pull\" or \"merge\" always leaves the original tip of the current "
-"branch in `ORIG_HEAD`, so resetting hard to it brings your index file and "
-"the working tree back to that state, and resets the tip of the branch to "
-"that commit."
+#, priority:280
+msgid "But you decided that the topic branch is not ready for public consumption yet. \"pull\" or \"merge\" always leaves the original tip of the current branch in `ORIG_HEAD`, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:228
-#, no-wrap
+#, no-wrap, priority:280
msgid "Undo a merge or pull inside a dirty working tree"
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:237
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
"Auto-merging nitfol\n"
@@ -49636,40 +42483,31 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:243
-msgid ""
-"Even if you may have local modifications in your working tree, you can "
-"safely say `git pull` when you know that the change in the other branch does "
-"not overlap with them."
+#, priority:280
+msgid "Even if you may have local modifications in your working tree, you can safely say `git pull` when you know that the change in the other branch does not overlap with them."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:248
-msgid ""
-"After inspecting the result of the merge, you may find that the change in "
-"the other branch is unsatisfactory. Running `git reset --hard ORIG_HEAD` "
-"will let you go back to where you were, but it will discard your local "
-"changes, which you do not want. `git reset --merge` keeps your local "
-"changes."
+#, priority:280
+msgid "After inspecting the result of the merge, you may find that the change in the other branch is unsatisfactory. Running `git reset --hard ORIG_HEAD` will let you go back to where you were, but it will discard your local changes, which you do not want. `git reset --merge` keeps your local changes."
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
-#, no-wrap
+#: en/git-reset.txt:250 en/git-stash.txt:286
+#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:256
-msgid ""
-"Suppose you are interrupted by an urgent fix request while you are in the "
-"middle of a large change. The files in your working tree are not in any "
-"shape to be committed yet, but you need to get to the other branch for a "
-"quick bugfix."
+#, priority:280
+msgid "Suppose you are interrupted by an urgent fix request while you are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix."
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:267
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"$ git switch feature ;# you were working in \"feature\" branch and\n"
"$ work work work ;# got interrupted\n"
@@ -49684,46 +42522,43 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:270
+#, priority:280
msgid "This commit will get blown away so a throw-away log message is OK."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:272
-msgid ""
-"This removes the 'WIP' commit from the commit history, and sets your working "
-"tree to the state just before you made that snapshot."
+#, priority:280
+msgid "This removes the 'WIP' commit from the commit history, and sets your working tree to the state just before you made that snapshot."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:275
-msgid ""
-"At this point the index file still has all the WIP changes you committed as "
-"'snapshot WIP'. This updates the index to show your WIP files as "
-"uncommitted."
+#, priority:280
+msgid "At this point the index file still has all the WIP changes you committed as 'snapshot WIP'. This updates the index to show your WIP files as uncommitted."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:277
+#, priority:280
msgid "See also linkgit:git-stash[1]."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:278
-#, no-wrap
+#, no-wrap, priority:280
msgid "Reset a single file in the index"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:283
-msgid ""
-"Suppose you have added a file to your index, but later decide you do not "
-"want to add it to your commit. You can remove the file from the index while "
-"keeping your changes with git reset."
+#, priority:280
+msgid "Suppose you have added a file to your index, but later decide you do not want to add it to your commit. You can remove the file from the index while keeping your changes with git reset."
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:288
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"$ git reset -- frotz.c <1>\n"
"$ git commit -m \"Commit files in index\" <2>\n"
@@ -49732,40 +42567,37 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:292
-msgid ""
-"This removes the file from the index while keeping it in the working "
-"directory."
+#, priority:280
+msgid "This removes the file from the index while keeping it in the working directory."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:293
+#, priority:280
msgid "This commits all other changes in the index."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:294
+#, priority:280
msgid "Adds the file to the index again."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:295
-#, no-wrap
+#, no-wrap, priority:280
msgid "Keep changes in working tree while discarding some previous commits"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:302
-msgid ""
-"Suppose you are working on something and you commit it, and then you "
-"continue working a bit more, but now you think that what you have in your "
-"working tree should be in another branch that has nothing to do with what "
-"you committed previously. You can start a new branch and reset it while "
-"keeping the changes in your working tree."
+#, priority:280
+msgid "Suppose you are working on something and you commit it, and then you continue working a bit more, but now you think that what you have in your working tree should be in another branch that has nothing to do with what you committed previously. You can start a new branch and reset it while keeping the changes in your working tree."
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:311
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git tag start\n"
"$ git switch -c branch1\n"
@@ -49778,45 +42610,37 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:314
+#, priority:280
msgid "This commits your first edits in `branch1`."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:318
-msgid ""
-"In the ideal world, you could have realized that the earlier commit did not "
-"belong to the new topic when you created and switched to `branch2` "
-"(i.e. `git switch -c branch2 start`), but nobody is perfect."
+#, priority:280
+msgid "In the ideal world, you could have realized that the earlier commit did not belong to the new topic when you created and switched to `branch2` (i.e. `git switch -c branch2 start`), but nobody is perfect."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:320
-msgid ""
-"But you can use `reset --keep` to remove the unwanted commit after you "
-"switched to `branch2`."
+#, priority:280
+msgid "But you can use `reset --keep` to remove the unwanted commit after you switched to `branch2`."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:321
-#, no-wrap
+#, no-wrap, priority:280
msgid "Split a commit apart into a sequence of commits"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:329
-msgid ""
-"Suppose that you have created lots of logically separate changes and "
-"committed them together. Then, later you decide that it might be better to "
-"have each logical chunk associated with its own commit. You can use git "
-"reset to rewind history without changing the contents of your local files, "
-"and then successively use `git add -p` to interactively select which hunks "
-"to include into each commit, using `git commit -c` to pre-populate the "
-"commit message."
+#, priority:280
+msgid "Suppose that you have created lots of logically separate changes and committed them together. Then, later you decide that it might be better to have each logical chunk associated with its own commit. You can use git reset to rewind history without changing the contents of your local files, and then successively use `git add -p` to interactively select which hunks to include into each commit, using `git commit -c` to pre-populate the commit message."
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:339
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git reset -N HEAD^ <1>\n"
"$ git add -p <2>\n"
@@ -49830,104 +42654,79 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:345
-msgid ""
-"First, reset the history back one commit so that we remove the original "
-"commit, but leave the working tree with all the changes. The -N ensures that "
-"any new files added with `HEAD` are still marked so that `git add -p` will "
-"find them."
+#, priority:280
+msgid "First, reset the history back one commit so that we remove the original commit, but leave the working tree with all the changes. The -N ensures that any new files added with `HEAD` are still marked so that `git add -p` will find them."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:349
-msgid ""
-"Next, we interactively select diff hunks to add using the `git add -p` "
-"facility. This will ask you about each diff hunk in sequence and you can use "
-"simple commands such as \"yes, include this\", \"No don't include this\" or "
-"even the very powerful \"edit\" facility."
+#, priority:280
+msgid "Next, we interactively select diff hunks to add using the `git add -p` facility. This will ask you about each diff hunk in sequence and you can use simple commands such as \"yes, include this\", \"No don't include this\" or even the very powerful \"edit\" facility."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:353
-msgid ""
-"Once satisfied with the hunks you want to include, you should verify what "
-"has been prepared for the first commit by using `git diff --cached`. This "
-"shows all the changes that have been moved into the index and are about to "
-"be committed."
+#, priority:280
+msgid "Once satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using `git diff --cached`. This shows all the changes that have been moved into the index and are about to be committed."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:360
-msgid ""
-"Next, commit the changes stored in the index. The `-c` option specifies to "
-"pre-populate the commit message from the original message that you started "
-"with in the first commit. This is helpful to avoid retyping it. The "
-"`HEAD@{1}` is a special notation for the commit that `HEAD` used to be at "
-"prior to the original reset commit (1 change ago). See "
-"linkgit:git-reflog[1] for more details. You may also use any other valid "
-"commit reference."
+#, priority:280
+msgid "Next, commit the changes stored in the index. The `-c` option specifies to pre-populate the commit message from the original message that you started with in the first commit. This is helpful to avoid retyping it. The `HEAD@{1}` is a special notation for the commit that `HEAD` used to be at prior to the original reset commit (1 change ago). See linkgit:git-reflog[1] for more details. You may also use any other valid commit reference."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:362
-msgid ""
-"You can repeat steps 2-4 multiple times to break the original code into any "
-"number of commits."
+#, priority:280
+msgid "You can repeat steps 2-4 multiple times to break the original code into any number of commits."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:365
-msgid ""
-"Now you've split out many of the changes into their own commits, and might "
-"no longer use the patch mode of `git add`, in order to select all remaining "
-"uncommitted changes."
+#, priority:280
+msgid "Now you've split out many of the changes into their own commits, and might no longer use the patch mode of `git add`, in order to select all remaining uncommitted changes."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:368
-msgid ""
-"Once again, check to verify that you've included what you want to. You may "
-"also wish to verify that git diff doesn't show any remaining changes to be "
-"committed later."
+#, priority:280
+msgid "Once again, check to verify that you've included what you want to. You may also wish to verify that git diff doesn't show any remaining changes to be committed later."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:369
+#, priority:280
msgid "And finally create the final commit."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:375
+#, priority:280
msgid "The tables below show what happens when running:"
msgstr ""
#. type: delimited block -
#: en/git-reset.txt:378
-#, no-wrap
+#, no-wrap, priority:280
msgid "git reset --option target\n"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:382
-msgid ""
-"to reset the `HEAD` to another commit (`target`) with the different reset "
-"options depending on the state of the files."
+#, priority:280
+msgid "to reset the `HEAD` to another commit (`target`) with the different reset options depending on the state of the files."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:391
-msgid ""
-"In these tables, `A`, `B`, `C` and `D` are some different states of a "
-"file. For example, the first line of the first table means that if a file is "
-"in state `A` in the working tree, in state `B` in the index, in state `C` in "
-"`HEAD` and in state `D` in the target, then `git reset --soft target` will "
-"leave the file in the working tree in state `A` and in the index in state "
-"`B`. It resets (i.e. moves) the `HEAD` (i.e. the tip of the current branch, "
-"if you are on one) to `target` (which has the file in state `D`)."
+#, priority:280
+msgid "In these tables, `A`, `B`, `C` and `D` are some different states of a file. For example, the first line of the first table means that if a file is in state `A` in the working tree, in state `B` in the index, in state `C` in `HEAD` and in state `D` in the target, then `git reset --soft target` will leave the file in the working tree in state `A` and in the index in state `B`. It resets (i.e. moves) the `HEAD` (i.e. the tip of the current branch, if you are on one) to `target` (which has the file in state `D`)."
msgstr ""
#. type: delimited block .
#: en/git-reset.txt:400
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
"----------------------------------------------------\n"
@@ -49940,7 +42739,7 @@ msgstr ""
#. type: delimited block .
#: en/git-reset.txt:410
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
"----------------------------------------------------\n"
@@ -49953,7 +42752,7 @@ msgstr ""
#. type: delimited block .
#: en/git-reset.txt:420
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
"----------------------------------------------------\n"
@@ -49966,7 +42765,7 @@ msgstr ""
#. type: delimited block .
#: en/git-reset.txt:430
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
"----------------------------------------------------\n"
@@ -49979,7 +42778,7 @@ msgstr ""
#. type: delimited block .
#: en/git-reset.txt:440
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
"----------------------------------------------------\n"
@@ -49992,7 +42791,7 @@ msgstr ""
#. type: delimited block .
#: en/git-reset.txt:450
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
"----------------------------------------------------\n"
@@ -50005,37 +42804,25 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:460
-msgid ""
-"`reset --merge` is meant to be used when resetting out of a conflicted "
-"merge. Any mergy operation guarantees that the working tree file that is "
-"involved in the merge does not have a local change with respect to the index "
-"before it starts, and that it writes the result out to the working tree. So "
-"if we see some difference between the index and the target and also between "
-"the index and the working tree, then it means that we are not resetting out "
-"from a state that a mergy operation left after failing with a conflict. That "
-"is why we disallow `--merge` option in this case."
+#, priority:280
+msgid "`reset --merge` is meant to be used when resetting out of a conflicted merge. Any mergy operation guarantees that the working tree file that is involved in the merge does not have a local change with respect to the index before it starts, and that it writes the result out to the working tree. So if we see some difference between the index and the target and also between the index and the working tree, then it means that we are not resetting out from a state that a mergy operation left after failing with a conflict. That is why we disallow `--merge` option in this case."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:469
-msgid ""
-"`reset --keep` is meant to be used when removing some of the last commits in "
-"the current branch while keeping changes in the working tree. If there could "
-"be conflicts between the changes in the commit we want to remove and the "
-"changes in the working tree we want to keep, the reset is disallowed. That's "
-"why it is disallowed if there are both changes between the working tree and "
-"`HEAD`, and between `HEAD` and the target. To be safe, it is also disallowed "
-"when there are unmerged entries."
+#, priority:280
+msgid "`reset --keep` is meant to be used when removing some of the last commits in the current branch while keeping changes in the working tree. If there could be conflicts between the changes in the commit we want to remove and the changes in the working tree we want to keep, the reset is disallowed. That's why it is disallowed if there are both changes between the working tree and `HEAD`, and between `HEAD` and the target. To be safe, it is also disallowed when there are unmerged entries."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:472
+#, priority:280
msgid "The following tables show what happens when there are unmerged entries:"
msgstr ""
#. type: delimited block .
#: en/git-reset.txt:481
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
"----------------------------------------------------\n"
@@ -50048,7 +42835,7 @@ msgstr ""
#. type: delimited block .
#: en/git-reset.txt:491
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"working index HEAD target working index HEAD\n"
"----------------------------------------------------\n"
@@ -50061,199 +42848,166 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:494
+#, priority:280
msgid "`X` means any state and `U` means an unmerged index."
msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
+#, priority:100
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
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"
+"'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 ""
#. type: Plain text
#: en/git-restore.txt:20
-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."
+#, priority:100
+msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-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`."
+#, priority:100
+msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:28
-msgid ""
-"By default, the restore sources for working tree and the index are the index "
-"and `HEAD` respectively. `--source` could be used to specify a commit as the "
-"restore source."
+#, priority:100
+msgid "By default, the restore sources for working tree and the index are the index and `HEAD` respectively. `--source` could be used to specify a commit as the restore source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:33 en/git-switch.txt:33
+#, priority:100
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap
+#, no-wrap, priority:100
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:37
-#, no-wrap
+#, no-wrap, priority:100
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:41
-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."
+#, priority:100
+msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:46
-msgid ""
-"If not specified, the default restore source for the working tree is the "
-"index, and the default restore source for the index is `HEAD`. When both "
-"`--staged` and `--worktree` are specified, `--source` must also be "
-"specified."
+#, priority:100
+msgid "If not specified, the default restore source for the working tree is the index, and the default restore source for the index is `HEAD`. When both `--staged` and `--worktree` are specified, `--source` must also be specified."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:53
-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."
+#, priority:100
+msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:56
-msgid ""
-"Note that `--patch` can accept no pathspec and will prompt to restore all "
-"modified paths."
+#, priority:100
+msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:59
-#, no-wrap
+#, no-wrap, priority:100
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:64
-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."
+#, priority:100
+msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:68
+#, priority:100
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:80
-msgid ""
-"When restoring files in the working tree from the index, use stage #2 "
-"('ours') or #3 ('theirs') for unmerged paths."
+#, priority:100
+msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:84
-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."
+#, priority:100
+msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:89
-msgid ""
-"When restoring files on the working tree from the index, recreate the "
-"conflicted merge in the unmerged paths."
+#, priority:100
+msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:97
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:102
-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."
+#, priority:100
+msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:109
-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>`."
+#, priority:100
+msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:116
-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."
+#, priority:100
+msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:144
-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."
+#, priority:100
+msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:150
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -50263,89 +43017,85 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:154
+#, priority:100
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:157
-msgid ""
-"If you want to restore _all_ C source files to match the version in the "
-"index, you can say"
+#, priority:100
+msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:160
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-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)."
+#, priority:100
+msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:168
+#, priority:100
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:171
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:175
-msgid ""
-"or to restore all working tree files with 'top' pathspec magic (see "
-"linkgit:gitglossary[7])"
+#, priority:100
+msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:178
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:182
-msgid ""
-"To restore a file in the index to match the version in `HEAD` (this is the "
-"same as using linkgit:git-reset[1])"
+#, priority:100
+msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:185
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:189
-msgid ""
-"or you can restore both the index and the working tree (this the same as "
-"using linkgit:git-checkout[1])"
+#, priority:100
+msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:192
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:195
+#, priority:100
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:198
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
@@ -50357,208 +43107,165 @@ msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
#. type: Title =
#: en/git-revert.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-revert(1)"
msgstr "git-revert(1)"
#. type: Plain text
#: en/git-revert.txt:7
+#, priority:100
msgid "git-revert - Revert some existing commits"
msgstr ""
#. type: Plain text
#: en/git-revert.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] "
-"<commit>...\n"
+"'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\n"
"'git revert' (--continue | --skip | --abort | --quit)\n"
msgstr ""
#. type: Plain text
#: en/git-revert.txt:21
-msgid ""
-"Given one or more existing commits, revert the changes that the related "
-"patches introduce, and record some new commits that record them. This "
-"requires your working tree to be clean (no modifications from the HEAD "
-"commit)."
+#, priority:100
+msgid "Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them. This requires your working tree to be clean (no modifications from the HEAD commit)."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:30
-msgid ""
-"Note: 'git revert' is used to record some new commits to reverse the effect "
-"of some earlier commits (often only a faulty one). If you want to throw "
-"away all uncommitted changes in your working directory, you should see "
-"linkgit:git-reset[1], particularly the `--hard` option. If you want to "
-"extract specific files as they were in another commit, you should see "
-"linkgit:git-restore[1], specifically the `--source` option. Take care with "
-"these alternatives as both will discard uncommitted changes in your working "
-"directory."
+#, priority:100
+msgid "Note: 'git revert' is used to record some new commits to reverse the effect of some earlier commits (often only a faulty one). If you want to throw away all uncommitted changes in your working directory, you should see linkgit:git-reset[1], particularly the `--hard` option. If you want to extract specific files as they were in another commit, you should see linkgit:git-restore[1], specifically the `--source` option. Take care with these alternatives as both will discard uncommitted changes in your working directory."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:43
-msgid ""
-"Commits to revert. For a more complete list of ways to spell commit names, "
-"see linkgit:gitrevisions[7]. Sets of commits can also be given but no "
-"traversal is done by default, see linkgit:git-rev-list[1] and its "
-"`--no-walk` option."
+#, priority:100
+msgid "Commits to revert. For a more complete list of ways to spell commit names, see linkgit:gitrevisions[7]. Sets of commits can also be given but no traversal is done by default, see linkgit:git-rev-list[1] and its `--no-walk` option."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:49
-msgid ""
-"With this option, 'git revert' will let you edit the commit message prior to "
-"committing the revert. This is the default if you run the command from a "
-"terminal."
+#, priority:100
+msgid "With this option, 'git revert' will let you edit the commit message prior to committing the revert. This is the default if you run the command from a terminal."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:57
-msgid ""
-"Usually you cannot revert a merge because you do not know which side of the "
-"merge should be considered the mainline. This option specifies the parent "
-"number (starting from 1) of the mainline and allows revert to reverse the "
-"change relative to the specified parent."
+#, priority:100
+msgid "Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows revert to reverse the change relative to the specified parent."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:62
-msgid ""
-"Reverting a merge commit declares that you will never want the tree changes "
-"brought in by the merge. As a result, later merges will only bring in tree "
-"changes introduced by commits that are not ancestors of the previously "
-"reverted merge. This may or may not be what you want."
+#, priority:100
+msgid "Reverting a merge commit declares that you will never want the tree changes brought in by the merge. As a result, later merges will only bring in tree changes introduced by commits that are not ancestors of the previously reverted merge. This may or may not be what you want."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:65
-msgid ""
-"See the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] "
-"for more details."
+#, priority:100
+msgid "See the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for more details."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:69
+#, priority:100
msgid "With this option, 'git revert' will not start the commit message editor."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:87
-msgid ""
-"Usually the command automatically creates some commits with commit log "
-"messages stating which commits were reverted. This flag applies the changes "
-"necessary to revert the named commits to your working tree and the index, "
-"but does not make the commits. In addition, when this option is used, your "
-"index does not have to match the HEAD commit. The revert is done against "
-"the beginning state of your index."
+#, priority:100
+msgid "Usually the command automatically creates some commits with commit log messages stating which commits were reverted. This flag applies the changes necessary to revert the named commits to your working tree and the index, but does not make the commits. In addition, when this option is used, your index does not have to match the HEAD commit. The revert is done against the beginning state of your index."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:90
-msgid ""
-"This is useful when reverting more than one commits' effect to your index in "
-"a row."
+#, priority:100
+msgid "This is useful when reverting more than one commits' effect to your index in a row."
msgstr ""
#. type: Labeled list
#: en/git-revert.txt:123
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git revert HEAD~3`"
msgstr ""
#. type: Plain text
#: en/git-revert.txt:127
-msgid ""
-"Revert the changes specified by the fourth last commit in HEAD and create a "
-"new commit with the reverted changes."
+#, priority:100
+msgid "Revert the changes specified by the fourth last commit in HEAD and create a new commit with the reverted changes."
msgstr ""
#. type: Labeled list
#: en/git-revert.txt:128
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git revert -n master~5..master~2`"
msgstr ""
#. type: Plain text
#: en/git-revert.txt:135
-msgid ""
-"Revert the changes done by commits from the fifth last commit in master "
-"(included) to the third last commit in master (included), but do not create "
-"any commit with the reverted changes. The revert only modifies the working "
-"tree and the index."
+#, priority:100
+msgid "Revert the changes done by commits from the fifth last commit in master (included) to the third last commit in master (included), but do not create any commit with the reverted changes. The revert only modifies the working tree and the index."
msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-rev-list(1)"
msgstr "git-rev-list(1)"
#. type: Plain text
#: en/git-rev-list.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr "Lista objetos commit en orden cronol처gico inverso"
#. type: Plain text
#: en/git-rev-list.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:21
-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."
+#, priority:100
+msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:28
-msgid ""
-"You can think of this as a set operation. Commits given on the command line "
-"form a set of commits that are reachable from any of them, and then commits "
-"reachable from any of the ones given with '{caret}' in front are subtracted "
-"from that set. The remaining commits are what comes out in the command's "
-"output. Various other options and paths parameters can be used to further "
-"limit the result."
+#, priority:100
+msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:30
+#, priority:100
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/git-rev-list.txt:33
-#, no-wrap
+#, no-wrap, priority:100
msgid "\t$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:37
-msgid ""
-"means \"list all the commits which are reachable from 'foo' or 'bar', but "
-"not from 'baz'\"."
+#, priority:100
+msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:41
-msgid ""
-"A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand "
-"for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following "
-"may be used interchangeably:"
+#, priority:100
+msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/git-rev-list.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t$ git rev-list origin..HEAD\n"
"\t$ git rev-list HEAD ^origin\n"
@@ -50566,15 +43273,13 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:50
-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:"
+#, ignore-ellipsis, priority:100
+msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
#: en/git-rev-list.txt:54
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
"\t$ git rev-list A...B\n"
@@ -50582,224 +43287,205 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:61
-msgid ""
-"'rev-list' is a very essential Git command, since it provides the ability to "
-"build and traverse commit ancestry graphs. For this reason, it has a lot of "
-"different options that enables it to be used by commands as different as "
-"'git bisect' and 'git repack'."
+#, priority:100
+msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-rev-parse(1)"
msgstr "git-rev-parse(1)"
#. type: Plain text
#: en/git-rev-parse.txt:7
+#, priority:100
msgid "git-rev-parse - Pick out and massage parameters"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git rev-parse' [<options>] <args>...\n"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:23
-msgid ""
-"Many Git porcelainish commands take mixture of flags (i.e. parameters that "
-"begin with a dash '-') and parameters meant for the underlying 'git "
-"rev-list' command they use internally and flags and parameters for the other "
-"commands they use downstream of 'git rev-list'. This command is used to "
-"distinguish between them."
+#, priority:100
+msgid "Many Git porcelainish commands take mixture of flags (i.e. parameters that begin with a dash '-') and parameters meant for the underlying 'git rev-list' command they use internally and flags and parameters for the other commands they use downstream of 'git rev-list'. This command is used to distinguish between them."
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:29
-#, no-wrap
+#, no-wrap, priority:100
msgid "Operation Modes"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:32
+#, priority:100
msgid "Each of these options must appear first on the command line."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--parseopt"
msgstr "--parseopt"
#. type: Plain text
#: en/git-rev-parse.txt:35
+#, priority:100
msgid "Use 'git rev-parse' in option parsing mode (see PARSEOPT section below)."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--sq-quote"
msgstr "--sq-quote"
#. type: Plain text
#: en/git-rev-parse.txt:40
-msgid ""
-"Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE section below). In "
-"contrast to the `--sq` option below, this mode does only quoting. Nothing "
-"else is done to command input."
+#, priority:100
+msgid "Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE section below). In contrast to the `--sq` option below, this mode does only quoting. Nothing else is done to command input."
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:42
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for --parseopt"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--keep-dashdash"
msgstr "--keep-dashdash"
#. type: Plain text
#: en/git-rev-parse.txt:47
-msgid ""
-"Only meaningful in `--parseopt` mode. Tells the option parser to echo out "
-"the first `--` met instead of skipping it."
+#, priority:100
+msgid "Only meaningful in `--parseopt` mode. Tells the option parser to echo out the first `--` met instead of skipping it."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stop-at-non-option"
msgstr "--stop-at-non-option"
#. type: Plain text
#: en/git-rev-parse.txt:52
-msgid ""
-"Only meaningful in `--parseopt` mode. Lets the option parser stop at the "
-"first non-option argument. This can be used to parse sub-commands that take "
-"options themselves."
+#, priority:100
+msgid "Only meaningful in `--parseopt` mode. Lets the option parser stop at the first non-option argument. This can be used to parse sub-commands that take options themselves."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stuck-long"
msgstr "--stuck-long"
#. type: Plain text
#: en/git-rev-parse.txt:56
-msgid ""
-"Only meaningful in `--parseopt` mode. Output the options in their long form "
-"if available, and with their arguments stuck."
+#, priority:100
+msgid "Only meaningful in `--parseopt` mode. Output the options in their long form if available, and with their arguments stuck."
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:58
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for Filtering"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--revs-only"
msgstr "--revs-only"
#. type: Plain text
#: en/git-rev-parse.txt:63
+#, priority:100
msgid "Do not output flags and parameters not meant for 'git rev-list' command."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-revs"
msgstr "--no-revs"
#. type: Plain text
#: en/git-rev-parse.txt:67
+#, priority:100
msgid "Do not output flags and parameters meant for 'git rev-list' command."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--flags"
msgstr "--flags"
#. type: Plain text
#: en/git-rev-parse.txt:70
+#, priority:100
msgid "Do not output non-flag parameters."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-flags"
msgstr "--no-flags"
#. type: Plain text
#: en/git-rev-parse.txt:73
+#, priority:100
msgid "Do not output flag parameters."
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:75
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for Output"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:77
-#, no-wrap
+#, no-wrap, priority:100
msgid "--default <arg>"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:80
+#, priority:100
msgid "If there is no parameter given by the user, use `<arg>` instead."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:81
-#, no-wrap
+#, no-wrap, priority:100
msgid "--prefix <arg>"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:86
-msgid ""
-"Behave as if 'git rev-parse' was invoked from the `<arg>` subdirectory of "
-"the working tree. Any relative filenames are resolved as if they are "
-"prefixed by `<arg>` and will be printed in that form."
+#, priority:100
+msgid "Behave as if 'git rev-parse' was invoked from the `<arg>` subdirectory of the working tree. Any relative filenames are resolved as if they are prefixed by `<arg>` and will be printed in that form."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:90
-msgid ""
-"This can be used to convert arguments to a command run in a subdirectory so "
-"that they can still be used after moving to the top-level of the "
-"repository. For example:"
+#, priority:100
+msgid "This can be used to convert arguments to a command run in a subdirectory so that they can still be used after moving to the top-level of the repository. For example:"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:96
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"prefix=$(git rev-parse --show-prefix)\n"
"cd \"$(git rev-parse --show-toplevel)\"\n"
@@ -50809,648 +43495,553 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:103
-msgid ""
-"Verify that exactly one parameter is provided, and that it can be turned "
-"into a raw 20-byte SHA-1 that can be used to access the object database. If "
-"so, emit it to the standard output; otherwise, error out."
+#, priority:100
+msgid "Verify that exactly one parameter is provided, and that it can be turned into a raw 20-byte SHA-1 that can be used to access the object database. If so, emit it to the standard output; otherwise, error out."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:112
-msgid ""
-"If you want to make sure that the output actually names an object in your "
-"object database and/or can be used as a specific type of object you require, "
-"you can add the `^{type}` peeling operator to the parameter. For example, "
-"`git rev-parse \"$VAR^{commit}\"` will make sure `$VAR` names an existing "
-"object that is a commit-ish (i.e. a commit, or an annotated tag that points "
-"at a commit). To make sure that `$VAR` names an existing object of any "
-"type, `git rev-parse \"$VAR^{object}\"` can be used."
+#, priority:100
+msgid "If you want to make sure that the output actually names an object in your object database and/or can be used as a specific type of object you require, you can add the `^{type}` peeling operator to the parameter. For example, `git rev-parse \"$VAR^{commit}\"` will make sure `$VAR` names an existing object that is a commit-ish (i.e. a commit, or an annotated tag that points at a commit). To make sure that `$VAR` names an existing object of any type, `git rev-parse \"$VAR^{object}\"` can be used."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:119
-msgid ""
-"Only meaningful in `--verify` mode. Do not output an error message if the "
-"first argument is not a valid object name; instead exit with non-zero status "
-"silently. SHA-1s for valid object names are printed to stdout on success."
+#, priority:100
+msgid "Only meaningful in `--verify` mode. Do not output an error message if the first argument is not a valid object name; instead exit with non-zero status silently. SHA-1s for valid object names are printed to stdout on success."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--sq"
msgstr "--sq"
#. type: Plain text
#: en/git-rev-parse.txt:128
-msgid ""
-"Usually the output is made one line per flag and parameter. This option "
-"makes output a single line, properly quoted for consumption by shell. "
-"Useful when you expect your parameter to contain whitespaces and newlines "
-"(e.g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to "
-"the `--sq-quote` option, the command input is still interpreted as usual."
+#, priority:100
+msgid "Usually the output is made one line per flag and parameter. This option makes output a single line, properly quoted for consumption by shell. Useful when you expect your parameter to contain whitespaces and newlines (e.g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to the `--sq-quote` option, the command input is still interpreted as usual."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:129
-#, no-wrap
+#, no-wrap, priority:100
msgid "--short[=length]"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:134
-msgid ""
-"Same as `--verify` but shortens the object name to a unique prefix with at "
-"least `length` characters. The minimum length is 4, the default is the "
-"effective value of the `core.abbrev` configuration variable (see "
-"linkgit:git-config[1])."
+#, priority:100
+msgid "Same as `--verify` but shortens the object name to a unique prefix with at least `length` characters. The minimum length is 4, the default is the effective value of the `core.abbrev` configuration variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:139
-msgid ""
-"When showing object names, prefix them with '{caret}' and strip '{caret}' "
-"prefix from the object names that already have one."
+#, priority:100
+msgid "When showing object names, prefix them with '{caret}' and strip '{caret}' prefix from the object names that already have one."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:140
-#, no-wrap
+#, no-wrap, priority:100
msgid "--abbrev-ref[=(strict|loose)]"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:144
-msgid ""
-"A non-ambiguous short name of the objects name. The option "
-"core.warnAmbiguousRefs is used to select the strict abbreviation mode."
+#, priority:100
+msgid "A non-ambiguous short name of the objects name. The option core.warnAmbiguousRefs is used to select the strict abbreviation mode."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--symbolic"
msgstr "--symbolic"
#. type: Plain text
#: en/git-rev-parse.txt:149
-msgid ""
-"Usually the object names are output in SHA-1 form (with possible '{caret}' "
-"prefix); this option makes them output in a form as close to the original "
-"input as possible."
+#, priority:100
+msgid "Usually the object names are output in SHA-1 form (with possible '{caret}' prefix); this option makes them output in a form as close to the original input as possible."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
#. type: Plain text
#: en/git-rev-parse.txt:157
-msgid ""
-"This is similar to --symbolic, but it omits input that are not refs "
-"(i.e. branch or tag names; or more explicitly disambiguating "
-"\"heads/master\" form, when you want to name the \"master\" branch when "
-"there is an unfortunately named tag \"master\"), and show them as full "
-"refnames (e.g. \"refs/heads/master\")."
+#, priority:100
+msgid "This is similar to --symbolic, but it omits input that are not refs (i.e. branch or tag names; or more explicitly disambiguating \"heads/master\" form, when you want to name the \"master\" branch when there is an unfortunately named tag \"master\"), and show them as full refnames (e.g. \"refs/heads/master\")."
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:159
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for Objects"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:163
+#, priority:100
msgid "Show all refs found in `refs/`."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:164
-#, no-wrap
+#, no-wrap, priority:100
msgid "--branches[=pattern]"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:165
-#, no-wrap
+#, no-wrap, priority:100
msgid "--tags[=pattern]"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:166
-#, no-wrap
+#, no-wrap, priority:100
msgid "--remotes[=pattern]"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:170
-msgid ""
-"Show all branches, tags, or remote-tracking branches, respectively (i.e., "
-"refs found in `refs/heads`, `refs/tags`, or `refs/remotes`, respectively)."
+#, priority:100
+msgid "Show all branches, tags, or remote-tracking branches, respectively (i.e., refs found in `refs/heads`, `refs/tags`, or `refs/remotes`, respectively)."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:174
-msgid ""
-"If a `pattern` is given, only refs matching the given shell glob are shown. "
-"If the pattern does not contain a globbing character (`?`, `*`, or `[`), it "
-"is turned into a prefix match by appending `/*`."
+#, priority:100
+msgid "If a `pattern` is given, only refs matching the given shell glob are shown. If the pattern does not contain a globbing character (`?`, `*`, or `[`), it is turned into a prefix match by appending `/*`."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:175
-#, no-wrap
+#, no-wrap, priority:100
msgid "--glob=pattern"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:181
-msgid ""
-"Show all refs matching the shell glob pattern `pattern`. If the pattern does "
-"not start with `refs/`, this is automatically prepended. If the pattern "
-"does not contain a globbing character (`?`, `*`, or `[`), it is turned into "
-"a prefix match by appending `/*`."
+#, priority:100
+msgid "Show all refs matching the shell glob pattern `pattern`. If the pattern does not start with `refs/`, this is automatically prepended. If the pattern does not contain a globbing character (`?`, `*`, or `[`), it is turned into a prefix match by appending `/*`."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:182 en/rev-list-options.txt:166
-#, no-wrap
+#, no-wrap, priority:260
msgid "--exclude=<glob-pattern>"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:189 en/rev-list-options.txt:174
-msgid ""
-"Do not include refs matching '<glob-pattern>' that the next `--all`, "
-"`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise "
-"consider. Repetitions of this option accumulate exclusion patterns up to the "
-"next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other "
-"options or arguments do not clear accumulated patterns)."
+#, priority:260
+msgid "Do not include refs matching '<glob-pattern>' that the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. Repetitions of this option accumulate exclusion patterns up to the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options or arguments do not clear accumulated patterns)."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:195 en/rev-list-options.txt:180
-msgid ""
-"The patterns given should not begin with `refs/heads`, `refs/tags`, or "
-"`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, "
-"respectively, and they must begin with `refs/` when applied to `--glob` or "
-"`--all`. If a trailing '/{asterisk}' is intended, it must be given "
-"explicitly."
+#, priority:260
+msgid "The patterns given should not begin with `refs/heads`, `refs/tags`, or `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:196
-#, no-wrap
+#, no-wrap, priority:100
msgid "--disambiguate=<prefix>"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:201
-msgid ""
-"Show every object whose name begins with the given prefix. The <prefix> "
-"must be at least 4 hexadecimal digits long to avoid listing each and every "
-"object in the repository by mistake."
+#, priority:100
+msgid "Show every object whose name begins with the given prefix. The <prefix> must be at least 4 hexadecimal digits long to avoid listing each and every object in the repository by mistake."
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:203
-#, no-wrap
+#, no-wrap, priority:100
msgid "Options for Files"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--local-env-vars"
msgstr "--local-env-vars"
#. type: Plain text
#: en/git-rev-parse.txt:210
-msgid ""
-"List the GIT_* environment variables that are local to the repository "
-"(e.g. GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR). Only the names of the "
-"variables are listed, not their value, even if they are set."
+#, priority:100
+msgid "List the GIT_* environment variables that are local to the repository (e.g. GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR). Only the names of the variables are listed, not their value, even if they are set."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--git-dir"
msgstr "--git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:215
-msgid ""
-"Show `$GIT_DIR` if defined. Otherwise show the path to the .git "
-"directory. The path shown, when relative, is relative to the current working "
-"directory."
+#, priority:100
+msgid "Show `$GIT_DIR` if defined. Otherwise show the path to the .git directory. The path shown, when relative, is relative to the current working directory."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:219
-msgid ""
-"If `$GIT_DIR` is not defined and the current directory is not detected to "
-"lie in a Git repository or work tree print a message to stderr and exit with "
-"nonzero status."
+#, priority:100
+msgid "If `$GIT_DIR` is not defined and the current directory is not detected to lie in a Git repository or work tree print a message to stderr and exit with nonzero status."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:223
+#, priority:100
msgid "Like `--git-dir`, but its output is always the canonicalized absolute path."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--git-common-dir"
msgstr "--git-common-dir"
#. type: Plain text
#: en/git-rev-parse.txt:226
+#, priority:100
msgid "Show `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:230
-msgid ""
-"When the current working directory is below the repository directory print "
-"\"true\", otherwise \"false\"."
+#, priority:100
+msgid "When the current working directory is below the repository directory print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--is-inside-work-tree"
msgstr "--is-inside-work-tree"
#. type: Plain text
#: en/git-rev-parse.txt:234
-msgid ""
-"When the current working directory is inside the work tree of the repository "
-"print \"true\", otherwise \"false\"."
+#, priority:100
+msgid "When the current working directory is inside the work tree of the repository print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
#. type: Plain text
#: en/git-rev-parse.txt:237
+#, priority:100
msgid "When the repository is bare print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:238
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--is-shallow-repository"
msgstr "--is-shallow-repository"
#. type: Plain text
#: en/git-rev-parse.txt:240
+#, priority:100
msgid "When the repository is shallow print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:241
-#, no-wrap
+#, no-wrap, priority:100
msgid "--resolve-git-dir <path>"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:246
-msgid ""
-"Check if <path> is a valid repository or a gitfile that points at a valid "
-"repository, and print the location of the repository. If <path> is a "
-"gitfile then the resolved path to the real repository is printed."
+#, priority:100
+msgid "Check if <path> is a valid repository or a gitfile that points at a valid repository, and print the location of the repository. If <path> is a gitfile then the resolved path to the real repository is printed."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:247
-#, no-wrap
+#, no-wrap, priority:100
msgid "--git-path <path>"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:253
-msgid ""
-"Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such "
-"as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if "
-"$GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path "
-"objects/abc\" returns /foo/bar/abc."
+#, ignore-ellipsis, priority:100
+msgid "Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if $GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path objects/abc\" returns /foo/bar/abc."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:254
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-cdup"
msgstr "--show-cdup"
#. type: Plain text
#: en/git-rev-parse.txt:258
-msgid ""
-"When the command is invoked from a subdirectory, show the path of the "
-"top-level directory relative to the current directory (typically a sequence "
-"of \"../\", or an empty string)."
+#, priority:100
+msgid "When the command is invoked from a subdirectory, show the path of the top-level directory relative to the current directory (typically a sequence of \"../\", or an empty string)."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:259
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-prefix"
msgstr "--show-prefix"
#. type: Plain text
#: en/git-rev-parse.txt:263
-msgid ""
-"When the command is invoked from a subdirectory, show the path of the "
-"current directory relative to the top-level directory."
+#, priority:100
+msgid "When the command is invoked from a subdirectory, show the path of the current directory relative to the top-level directory."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:264
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-toplevel"
msgstr "--show-toplevel"
#. type: Plain text
#: en/git-rev-parse.txt:267
-msgid ""
-"Show the absolute path of the top-level directory of the working tree. If "
-"there is no working tree, report an error."
+#, priority:100
+msgid "Show the absolute path of the top-level directory of the working tree. If there is no working tree, report an error."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:268
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-superproject-working-tree"
msgstr "--show-superproject-working-tree"
#. type: Plain text
#: en/git-rev-parse.txt:273
-msgid ""
-"Show the absolute path of the root of the superproject's working tree (if "
-"exists) that uses the current repository as its submodule. Outputs nothing "
-"if the current repository is not used as a submodule by any project."
+#, priority:100
+msgid "Show the absolute path of the root of the superproject's working tree (if exists) that uses the current repository as its submodule. Outputs nothing if the current repository is not used as a submodule by any project."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:274
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--shared-index-path"
msgstr "--shared-index-path"
#. type: Plain text
#: en/git-rev-parse.txt:277
-msgid ""
-"Show the path to the shared index file in split index mode, or empty if not "
-"in split-index mode."
+#, priority:100
+msgid "Show the path to the shared index file in split index mode, or empty if not in split-index mode."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:278
-#, no-wrap
+#, no-wrap, priority:100
msgid "--show-object-format[=(storage|input|output)]"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:283
-msgid ""
-"Show the object format (hash algorithm) used for the repository for storage "
-"inside the `.git` directory, input, or output. For input, multiple "
-"algorithms may be printed, space-separated. If not specified, the default "
-"is \"storage\"."
+#, priority:100
+msgid "Show the object format (hash algorithm) used for the repository for storage inside the `.git` directory, input, or output. For input, multiple algorithms may be printed, space-separated. If not specified, the default is \"storage\"."
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:286
-#, no-wrap
+#, no-wrap, priority:100
msgid "Other Options"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:288
-#, no-wrap
+#, no-wrap, priority:100
msgid "--since=datestring"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:289
-#, no-wrap
+#, no-wrap, priority:100
msgid "--after=datestring"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:292
-msgid ""
-"Parse the date string, and output the corresponding --max-age= parameter for "
-"'git rev-list'."
+#, priority:100
+msgid "Parse the date string, and output the corresponding --max-age= parameter for 'git rev-list'."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:293
-#, no-wrap
+#, no-wrap, priority:100
msgid "--until=datestring"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:294
-#, no-wrap
+#, no-wrap, priority:100
msgid "--before=datestring"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:297
-msgid ""
-"Parse the date string, and output the corresponding --min-age= parameter for "
-"'git rev-list'."
+#, priority:100
+msgid "Parse the date string, and output the corresponding --min-age= parameter for 'git rev-list'."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:298
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<args>..."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:300
+#, priority:100
msgid "Flags and parameters to be parsed."
msgstr ""
#. type: Title -
#: en/git-rev-parse.txt:305
-#, no-wrap
+#, no-wrap, priority:100
msgid "PARSEOPT"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:310
-msgid ""
-"In `--parseopt` mode, 'git rev-parse' helps massaging options to bring to "
-"shell scripts the same facilities C builtins have. It works as an option "
-"normalizer (e.g. splits single switches aggregate values), a bit like "
-"`getopt(1)` does."
+#, priority:100
+msgid "In `--parseopt` mode, 'git rev-parse' helps massaging options to bring to shell scripts the same facilities C builtins have. It works as an option normalizer (e.g. splits single switches aggregate values), a bit like `getopt(1)` does."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:315
-msgid ""
-"It takes on the standard input the specification of the options to parse and "
-"understand, and echoes on the standard output a string suitable for `sh(1)` "
-"`eval` to replace the arguments with normalized ones. In case of error, it "
-"outputs usage on the standard error stream, and exits with code 129."
+#, priority:100
+msgid "It takes on the standard input the specification of the options to parse and understand, and echoes on the standard output a string suitable for `sh(1)` `eval` to replace the arguments with normalized ones. In case of error, it outputs usage on the standard error stream, and exits with code 129."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:318
-msgid ""
-"Note: Make sure you quote the result when passing it to `eval`. See below "
-"for an example."
+#, priority:100
+msgid "Note: Make sure you quote the result when passing it to `eval`. See below for an example."
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:320
-#, no-wrap
+#, no-wrap, priority:100
msgid "Input Format"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:326
-msgid ""
-"'git rev-parse --parseopt' input format is fully text based. It has two "
-"parts, separated by a line that contains only `--`. The lines before the "
-"separator (should be one or more) are used for the usage. The lines after "
-"the separator describe the options."
+#, priority:100
+msgid "'git rev-parse --parseopt' input format is fully text based. It has two parts, separated by a line that contains only `--`. The lines before the separator (should be one or more) are used for the usage. The lines after the separator describe the options."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:328
+#, priority:100
msgid "Each line of options has this format:"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:331
-#, no-wrap
+#, no-wrap, priority:100
msgid "<opt-spec><flags>*<arg-hint>? SP+ help LF\n"
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:333
-#, no-wrap
+#, no-wrap, priority:100
msgid "`<opt-spec>`"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:338
-msgid ""
-"its format is the short option character, then the long option name "
-"separated by a comma. Both parts are not required, though at least one is "
-"necessary. May not contain any of the `<flags>` characters. `h,help`, "
-"`dry-run` and `f` are examples of correct `<opt-spec>`."
+#, priority:100
+msgid "its format is the short option character, then the long option name separated by a comma. Both parts are not required, though at least one is necessary. May not contain any of the `<flags>` characters. `h,help`, `dry-run` and `f` are examples of correct `<opt-spec>`."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:339
-#, no-wrap
+#, no-wrap, priority:100
msgid "`<flags>`"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:341
+#, priority:100
msgid "`<flags>` are of `*`, `=`, `?` or `!`."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:342
+#, priority:100
msgid "Use `=` if the option takes an argument."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:346
-msgid ""
-"Use `?` to mean that the option takes an optional argument. You probably "
-"want to use the `--stuck-long` mode to be able to unambiguously parse the "
-"optional argument."
+#, priority:100
+msgid "Use `?` to mean that the option takes an optional argument. You probably want to use the `--stuck-long` mode to be able to unambiguously parse the optional argument."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:350
-msgid ""
-"Use `*` to mean that this option should not be listed in the usage generated "
-"for the `-h` argument. It's shown for `--help-all` as documented in "
-"linkgit:gitcli[7]."
+#, priority:100
+msgid "Use `*` to mean that this option should not be listed in the usage generated for the `-h` argument. It's shown for `--help-all` as documented in linkgit:gitcli[7]."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:352
+#, priority:100
msgid "Use `!` to not make the corresponding negated long option available."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:353
-#, no-wrap
+#, no-wrap, priority:100
msgid "`<arg-hint>`"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:358
-msgid ""
-"`<arg-hint>`, if specified, is used as a name of the argument in the help "
-"output, for options that take arguments. `<arg-hint>` is terminated by the "
-"first whitespace. It is customary to use a dash to separate words in a "
-"multi-word argument hint."
+#, priority:100
+msgid "`<arg-hint>`, if specified, is used as a name of the argument in the help output, for options that take arguments. `<arg-hint>` is terminated by the first whitespace. It is customary to use a dash to separate words in a multi-word argument hint."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:361
-msgid ""
-"The remainder of the line, after stripping the spaces, is used as the help "
-"associated to the option."
+#, priority:100
+msgid "The remainder of the line, after stripping the spaces, is used as the help associated to the option."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:365
-msgid ""
-"Blank lines are ignored, and lines that don't match this specification are "
-"used as option group headers (start the line with a space to create such "
-"lines on purpose)."
+#, priority:100
+msgid "Blank lines are ignored, and lines that don't match this specification are used as option group headers (start the line with a space to create such lines on purpose)."
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:372
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"OPTS_SPEC=\"\\\n"
"some-command [<options>] <args>...\n"
@@ -51458,7 +44049,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:374
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"some-command does foo and bar!\n"
"--\n"
@@ -51466,13 +44057,13 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:376
-#, no-wrap
+#, no-wrap, priority:100
msgid "h,help show the help\n"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:381
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"foo some nifty option --foo\n"
"bar= some cool option --bar with an argument\n"
@@ -51482,7 +44073,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:384
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" An option group Header\n"
"C? option C with an optional argument\"\n"
@@ -51490,52 +44081,48 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:386
-#, no-wrap
-msgid ""
-"eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo "
-"exit $?)\"\n"
+#, no-wrap, priority:100
+msgid "eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo exit $?)\"\n"
msgstr ""
#. type: Title ~
#: en/git-rev-parse.txt:390
-#, no-wrap
+#, no-wrap, priority:100
msgid "Usage text"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:394
-msgid ""
-"When `\"$@\"` is `-h` or `--help` in the above example, the following usage "
-"text would be shown:"
+#, priority:100
+msgid "When `\"$@\"` is `-h` or `--help` in the above example, the following usage text would be shown:"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:397
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "usage: some-command [<options>] <args>...\n"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:399
-#, no-wrap
+#, no-wrap, priority:100
msgid " some-command does foo and bar!\n"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:405
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" -h, --help show the help\n"
" --foo some nifty option --foo\n"
" --bar ... some cool option --bar with an argument\n"
" --baz <arg> another cool option --baz with a named argument\n"
-" --qux[=<path>] qux may take a path argument but has meaning by "
-"itself\n"
+" --qux[=<path>] qux may take a path argument but has meaning by itself\n"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:408
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"An option group Header\n"
" -C[...] option C with an optional argument\n"
@@ -51543,35 +44130,30 @@ msgstr ""
#. type: Title -
#: en/git-rev-parse.txt:411
-#, no-wrap
+#, no-wrap, priority:100
msgid "SQ-QUOTE"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:417
-msgid ""
-"In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single "
-"line suitable for `sh(1)` `eval`. This line is made by normalizing the "
-"arguments following `--sq-quote`. Nothing other than quoting the arguments "
-"is done."
+#, priority:100
+msgid "In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single line suitable for `sh(1)` `eval`. This line is made by normalizing the arguments following `--sq-quote`. Nothing other than quoting the arguments is done."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:421
-msgid ""
-"If you want command input to still be interpreted as usual by 'git "
-"rev-parse' before the output is shell quoted, see the `--sq` option."
+#, priority:100
+msgid "If you want command input to still be interpreted as usual by 'git rev-parse' before the output is shell quoted, see the `--sq` option."
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:433
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ cat >your-git-script.sh <<\\EOF\n"
"#!/bin/sh\n"
"args=$(git rev-parse --sq-quote \"$@\") # quote user-supplied arguments\n"
-"command=\"git frotz -n24 $args\" # and use it inside a "
-"handcrafted\n"
+"command=\"git frotz -n24 $args\" # and use it inside a handcrafted\n"
"\t\t\t\t\t# command line\n"
"eval \"$command\"\n"
"EOF\n"
@@ -51579,360 +44161,304 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:435
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ sh your-git-script.sh \"a b'c\"\n"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:441
+#, priority:100
msgid "Print the object name of the current commit:"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:444
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git rev-parse --verify HEAD\n"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:447
+#, priority:100
msgid "Print the commit object name from the revision in the $REV shell variable:"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:450
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git rev-parse --verify $REV^{commit}\n"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:453
+#, priority:100
msgid "This will error out if $REV is empty or not a valid revision."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:455
+#, priority:100
msgid "Similar to above:"
msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:458
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git rev-parse --default master --verify $REV\n"
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:461
+#, priority:100
msgid "but if $REV is empty, the commit object name from master will be printed."
msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "git-rm(1)"
msgstr "git-rm(1)"
#. type: Plain text
#: en/git-rm.txt:7
-#, fuzzy
+#, fuzzy, priority:280
msgid "git-rm - Remove files from the working tree and from the index"
msgstr "Borra archivos del 찼rbol de trabajo y del 챠ndice"
#. type: Plain text
-#: en/git-rm.txt:12
-#, no-wrap
+#: en/git-rm.txt:14
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] "
-"[--] <file>...\n"
-msgstr ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
+msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<찼rbol-ismo>]"
#. type: Plain text
-#: en/git-rm.txt:25
-msgid ""
-"Remove files from the index, or from the working tree and the index. `git "
-"rm` will not remove a file from just your working directory. (There is no "
-"option to remove a file only from the working tree and yet keep it in the "
-"index; use `/bin/rm` if you want to do that.) The files being removed have "
-"to be identical to the tip of the branch, and no updates to their contents "
-"can be staged in the index, though that default behavior can be overridden "
-"with the `-f` option. When `--cached` is given, the staged content has to "
-"match either the tip of the branch or the file on disk, allowing the file to "
-"be removed from just the index."
+#: en/git-rm.txt:27
+#, priority:280
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, no-wrap
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
-msgid ""
-"Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching "
-"files. If you want Git to expand file glob characters, you may need to "
-"shell-escape them. A leading directory name (e.g. `dir` to remove "
-"`dir/file1` and `dir/file2`) can be given to remove all files in the "
-"directory, and recursively all sub-directories, but this requires the `-r` "
-"option to be explicitly given."
+#, priority:280
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
-#, fuzzy
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
+#, fuzzy, priority:280
msgid "Override the up-to-date check."
msgstr "sobrescribir el check de actualizado"
#. type: Plain text
-#: en/git-rm.txt:48
-msgid ""
-"Don't actually remove any file(s). Instead, just show if they exist in the "
-"index and would otherwise be removed by the command."
+#: en/git-rm.txt:55
+#, priority:280
+msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
+#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
-msgid ""
-"Use this option to unstage and remove paths only from the index. Working "
-"tree files, whether modified or not, will be left alone."
+#: en/git-rm.txt:69
+#, priority:280
+msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
-#, no-wrap
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
-#, fuzzy
+#: en/git-rm.txt:72
+#, fuzzy, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr "salir con estado cero incluso si nada coincide"
#. type: Plain text
-#: en/git-rm.txt:70
-msgid ""
-"`git rm` normally outputs one line (in the form of an `rm` command) for "
-"each file removed. This option suppresses that output."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:79
-msgid ""
-"The <file> list given to the command can be exact pathnames, file glob "
-"patterns, or leading directory names. The command removes only the paths "
-"that are known to Git. Giving the name of a file that you have not told Git "
-"about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-msgid ""
-"File globbing matches across directory boundaries. Thus, given two "
-"directories `d` and `d2`, there is a difference between using `git rm 'd*'` "
-"and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+#: en/git-rm.txt:77
+#, priority:280
+msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
#. type: Title -
-#: en/git-rm.txt:86
-#, no-wrap
+#: en/git-rm.txt:93
+#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
-msgid ""
-"There is no option for `git rm` to remove from the index only the paths that "
-"have disappeared from the filesystem. However, depending on the use case, "
-"there are several ways that can be done."
+#: en/git-rm.txt:98
+#, priority:280
+msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
-#, no-wrap
+#: en/git-rm.txt:100
+#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
-msgid ""
-"If you intend that your next commit should record all modifications of "
-"tracked files in the working tree and record all removals of files that have "
-"been removed from the working tree with `rm` (as opposed to `git rm`), use "
-"`git commit -a`, as it will automatically notice and record all removals. "
-"You can also have a similar effect without committing by using `git add -u`."
+#: en/git-rm.txt:107
+#, priority:280
+msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
-#, no-wrap
+#: en/git-rm.txt:109
+#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
-msgid ""
-"When accepting a new code drop for a vendor branch, you probably want to "
-"record both the removal of paths and additions of new paths as well as "
-"modifications of existing paths."
+#: en/git-rm.txt:113
+#, priority:280
+msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
-msgid ""
-"Typically you would first remove all tracked files from the working tree "
-"using this command:"
+#: en/git-rm.txt:116
+#, priority:280
+msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
-#, no-wrap
+#: en/git-rm.txt:119
+#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
-msgid ""
-"and then untar the new code in the working tree. Alternately you could "
-"'rsync' the changes into the working tree."
+#: en/git-rm.txt:123
+#, priority:280
+msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
-msgid ""
-"After that, the easiest way to record all removals, additions, and "
-"modifications in the working tree is:"
+#: en/git-rm.txt:126
+#, priority:280
+msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
-#, no-wrap
+#: en/git-rm.txt:129
+#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
-#, fuzzy
+#: en/git-rm.txt:132
+#, fuzzy, priority:280
msgid "See linkgit:git-add[1]."
msgstr "linkgit:git-add[1]"
#. type: Title ~
-#: en/git-rm.txt:127
-#, no-wrap
+#: en/git-rm.txt:134
+#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
-msgid ""
-"If all you really want to do is to remove from the index the files that are "
-"no longer present in the working tree (perhaps because your working tree is "
-"dirty so that you cannot use `git commit -a`), use the following command:"
+#: en/git-rm.txt:139
+#, priority:280
+msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
-#, no-wrap
+#: en/git-rm.txt:142
+#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
-msgid ""
-"Only submodules using a gitfile (which means they were cloned with a Git "
-"version 1.7.8 or newer) will be removed from the work tree, as their "
-"repository lives inside the .git directory of the superproject. If a "
-"submodule (or one of those nested inside it) still uses a .git directory, "
-"`git rm` will move the submodules git directory into the superprojects git "
-"directory to protect the submodule's history. If it exists the "
-"submodule.<name> section in the linkgit:gitmodules[5] file will also be "
-"removed and that file will be staged (unless --cached or -n are used)."
+#: en/git-rm.txt:155
+#, priority:280
+msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
-msgid ""
-"A submodule is considered up to date when the HEAD is the same as recorded "
-"in the index, no tracked files are modified and no untracked files that "
-"aren't ignored are present in the submodules work tree. Ignored files are "
-"deemed expendable and won't stop a submodule's work tree from being removed."
+#: en/git-rm.txt:161
+#, priority:280
+msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
-msgid ""
-"If you only want to remove the local checkout of a submodule from your work "
-"tree without committing the removal, use linkgit:git-submodule[1] `deinit` "
-"instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
+#: en/git-rm.txt:165
+#, priority:280
+msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
-#, no-wrap
+#: en/git-rm.txt:168
+#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
-msgid ""
-"Removes all `*.txt` files from the index that are under the `Documentation` "
-"directory and any of its subdirectories."
+#: en/git-rm.txt:171
+#, priority:280
+msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
-msgid ""
-"Note that the asterisk `*` is quoted from the shell in this example; this "
-"lets Git, and not the shell, expand the pathnames of files and "
-"subdirectories under the `Documentation/` directory."
+#: en/git-rm.txt:175
+#, priority:280
+msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
-#, no-wrap
+#: en/git-rm.txt:176
+#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
-msgid ""
-"Because this example lets the shell expand the asterisk (i.e. you are "
-"listing the files explicitly), it does not remove `subdir/git-foo.sh`."
+#: en/git-rm.txt:180
+#, priority:280
+msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
-msgid ""
-"Each time a superproject update removes a populated submodule (e.g. when "
-"switching between commits before and after the removal) a stale submodule "
-"checkout will remain in the old location. Removing the old directory is only "
-"safe when it uses a gitfile, as otherwise the history of the submodule will "
-"be deleted too. This step will be obsolete when recursive submodule update "
-"has been implemented."
+#: en/git-rm.txt:189
+#, priority:280
+msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-send-email(1)"
msgstr "git-send-email(1)"
#. type: Plain text
#: en/git-send-email.txt:7
+#, priority:100
msgid "git-send-email - Send a collection of patches as emails"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:14
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git send-email' [<options>] <file|directory|rev-list options>...\n"
"'git send-email' --dump-aliases\n"
@@ -51940,195 +44466,169 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:23
-msgid ""
-"Takes the patches given on the command line and emails them out. Patches "
-"can be specified as files, directories (which will send all files in the "
-"directory), or directly as a revision list. In the last case, any format "
-"accepted by linkgit:git-format-patch[1] can be passed to git send-email."
+#, priority:100
+msgid "Takes the patches given on the command line and emails them out. Patches can be specified as files, directories (which will send all files in the directory), or directly as a revision list. In the last case, any format accepted by linkgit:git-format-patch[1] can be passed to git send-email."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:27
-msgid ""
-"The header of the email is configurable via command-line options. If not "
-"specified on the command line, the user will be prompted with a ReadLine "
-"enabled interface to provide the necessary information."
+#, priority:100
+msgid "The header of the email is configurable via command-line options. If not specified on the command line, the user will be prompted with a ReadLine enabled interface to provide the necessary information."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:29
+#, priority:100
msgid "There are two formats accepted for patch files:"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:31
+#, priority:100
msgid "mbox format files"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:34
-msgid ""
-"This is what linkgit:git-format-patch[1] generates. Most headers and MIME "
-"formatting are ignored."
+#, priority:100
+msgid "This is what linkgit:git-format-patch[1] generates. Most headers and MIME formatting are ignored."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:37
-msgid ""
-"The original format used by Greg Kroah-Hartman's 'send_lots_of_email.pl' "
-"script"
+#, priority:100
+msgid "The original format used by Greg Kroah-Hartman's 'send_lots_of_email.pl' script"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:40
-msgid ""
-"This format expects the first line of the file to contain the \"Cc:\" value "
-"and the \"Subject:\" of the message as the second line."
+#, priority:100
+msgid "This format expects the first line of the file to contain the \"Cc:\" value and the \"Subject:\" of the message as the second line."
msgstr ""
#. type: Title ~
#: en/git-send-email.txt:46
-#, no-wrap
+#, no-wrap, priority:100
msgid "Composing"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:61
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--annotate"
msgstr "--annotate"
#. type: Plain text
#: en/git-send-email.txt:52
-msgid ""
-"Review and edit each patch you're about to send. Default is the value of "
-"`sendemail.annotate`. See the CONFIGURATION section for "
-"`sendemail.multiEdit`."
+#, priority:100
+msgid "Review and edit each patch you're about to send. Default is the value of `sendemail.annotate`. See the CONFIGURATION section for `sendemail.multiEdit`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:53
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--bcc=<address>,..."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:56
-msgid ""
-"Specify a \"Bcc:\" value for each email. Default is the value of "
-"`sendemail.bcc`."
+#, priority:100
+msgid "Specify a \"Bcc:\" value for each email. Default is the value of `sendemail.bcc`."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:58 en/git-send-email.txt:64 en/git-send-email.txt:126
+#, priority:100
msgid "This option may be specified multiple times."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:59
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--cc=<address>,..."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:62
-msgid ""
-"Specify a starting \"Cc:\" value for each email. Default is the value of "
-"`sendemail.cc`."
+#, priority:100
+msgid "Specify a starting \"Cc:\" value for each email. Default is the value of `sendemail.cc`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--compose"
msgstr "--compose"
#. type: Plain text
#: en/git-send-email.txt:68
-msgid ""
-"Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1]) to edit an "
-"introductory message for the patch series."
+#, priority:100
+msgid "Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1]) to edit an introductory message for the patch series."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:74
-msgid ""
-"When `--compose` is used, git send-email will use the From, Subject, and "
-"In-Reply-To headers specified in the message. If the body of the message "
-"(what you type after the headers and a blank line) only contains blank (or "
-"Git: prefixed) lines, the summary won't be sent, but From, Subject, and "
-"In-Reply-To headers will be used unless they are removed."
+#, priority:100
+msgid "When `--compose` is used, git send-email will use the From, Subject, and In-Reply-To headers specified in the message. If the body of the message (what you type after the headers and a blank line) only contains blank (or Git: prefixed) lines, the summary won't be sent, but From, Subject, and In-Reply-To headers will be used unless they are removed."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:76
+#, priority:100
msgid "Missing From or In-Reply-To headers will be prompted for."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:78
+#, priority:100
msgid "See the CONFIGURATION section for `sendemail.multiEdit`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:79
-#, no-wrap
+#, no-wrap, priority:100
msgid "--from=<address>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:86
-msgid ""
-"Specify the sender of the emails. If not specified on the command line, the "
-"value of the `sendemail.from` configuration option is used. If neither the "
-"command-line option nor `sendemail.from` are set, then the user will be "
-"prompted for the value. The default for the prompt will be the value of "
-"GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by "
-"\"git var -l\"."
+#, priority:100
+msgid "Specify the sender of the emails. If not specified on the command line, the value of the `sendemail.from` configuration option is used. If neither the command-line option nor `sendemail.from` are set, then the user will be prompted for the value. The default for the prompt will be the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by \"git var -l\"."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:87
-#, no-wrap
+#, no-wrap, priority:100
msgid "--reply-to=<address>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:91
-msgid ""
-"Specify the address where replies from recipients should go to. Use this if "
-"replies to messages should go to another address than what is specified with "
-"the --from parameter."
+#, priority:100
+msgid "Specify the address where replies from recipients should go to. Use this if replies to messages should go to another address than what is specified with the --from parameter."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:92
-#, no-wrap
+#, no-wrap, priority:100
msgid "--in-reply-to=<identifier>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:98
-msgid ""
-"Make the first mail (or all the mails with `--no-thread`) appear as a reply "
-"to the given Message-Id, which avoids breaking threads to provide a new "
-"patch series. The second and subsequent emails will be sent as replies "
-"according to the `--[no-]chain-reply-to` setting."
+#, priority:100
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series. The second and subsequent emails will be sent as replies according to the `--[no-]chain-reply-to` setting."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:102
-msgid ""
-"So for example when `--thread` and `--no-chain-reply-to` are specified, the "
-"second and subsequent patches will be replies to the first one like in the "
-"illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`:"
+#, priority:100
+msgid "So for example when `--thread` and `--no-chain-reply-to` are specified, the second and subsequent patches will be replies to the first one like in the illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`:"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:110
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" [PATCH 0/2] Here is what I did...\n"
" [PATCH 1/2] Clean up and tests\n"
@@ -52141,758 +44641,637 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:113
-msgid ""
-"Only necessary if --compose is also set. If --compose is not set, this will "
-"be prompted for."
+#, priority:100
+msgid "Only necessary if --compose is also set. If --compose is not set, this will be prompted for."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:114
-#, no-wrap
+#, no-wrap, priority:100
msgid "--subject=<string>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:118
-msgid ""
-"Specify the initial subject of the email thread. Only necessary if "
-"--compose is also set. If --compose is not set, this will be prompted for."
+#, priority:100
+msgid "Specify the initial subject of the email thread. Only necessary if --compose is also set. If --compose is not set, this will be prompted for."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:119
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--to=<address>,..."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:124
-msgid ""
-"Specify the primary recipient of the emails generated. Generally, this will "
-"be the upstream maintainer of the project involved. Default is the value of "
-"the `sendemail.to` configuration value; if that is unspecified, and --to-cmd "
-"is not specified, this will be prompted for."
+#, priority:100
+msgid "Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. Default is the value of the `sendemail.to` configuration value; if that is unspecified, and --to-cmd is not specified, this will be prompted for."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:127
-#, no-wrap
+#, no-wrap, priority:100
msgid "--8bit-encoding=<encoding>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:133
-msgid ""
-"When encountering a non-ASCII message or subject that does not declare its "
-"encoding, add headers/quoting to indicate it is encoded in <encoding>. "
-"Default is the value of the 'sendemail.assume8bitEncoding'; if that is "
-"unspecified, this will be prompted for if any non-ASCII files are "
-"encountered."
+#, priority:100
+msgid "When encountering a non-ASCII message or subject that does not declare its encoding, add headers/quoting to indicate it is encoded in <encoding>. Default is the value of the 'sendemail.assume8bitEncoding'; if that is unspecified, this will be prompted for if any non-ASCII files are encountered."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:135
+#, priority:100
msgid "Note that no attempts whatsoever are made to validate the encoding."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:136
-#, no-wrap
+#, no-wrap, priority:100
msgid "--compose-encoding=<encoding>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:139
-msgid ""
-"Specify encoding of compose message. Default is the value of the "
-"'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed."
+#, priority:100
+msgid "Specify encoding of compose message. Default is the value of the 'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:140
-#, no-wrap
+#, no-wrap, priority:100
msgid "--transfer-encoding=(7bit|8bit|quoted-printable|base64|auto)"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:148
-msgid ""
-"Specify the transfer encoding to be used to send the message over SMTP. "
-"7bit will fail upon encountering a non-ASCII message. quoted-printable can "
-"be useful when the repository contains files that contain carriage returns, "
-"but makes the raw patch email file (as saved from a MUA) much harder to "
-"inspect manually. base64 is even more fool proof, but also even more "
-"opaque. auto will use 8bit when possible, and quoted-printable otherwise."
+#, priority:100
+msgid "Specify the transfer encoding to be used to send the message over SMTP. 7bit will fail upon encountering a non-ASCII message. quoted-printable can be useful when the repository contains files that contain carriage returns, but makes the raw patch email file (as saved from a MUA) much harder to inspect manually. base64 is even more fool proof, but also even more opaque. auto will use 8bit when possible, and quoted-printable otherwise."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:151
-msgid ""
-"Default is the value of the `sendemail.transferEncoding` configuration "
-"value; if that is unspecified, default to `auto`."
+#, priority:100
+msgid "Default is the value of the `sendemail.transferEncoding` configuration value; if that is unspecified, default to `auto`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:152
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--xmailer"
msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:153
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-xmailer"
msgstr "--no-xmailer"
#. type: Plain text
#: en/git-send-email.txt:157
-msgid ""
-"Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is "
-"added, but it can be turned off by setting the `sendemail.xmailer` "
-"configuration variable to `false`."
+#, priority:100
+msgid "Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is added, but it can be turned off by setting the `sendemail.xmailer` configuration variable to `false`."
msgstr ""
#. type: Title ~
#: en/git-send-email.txt:159
-#, no-wrap
+#, no-wrap, priority:100
msgid "Sending"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:161
-#, no-wrap
+#, no-wrap, priority:100
msgid "--envelope-sender=<address>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:169
-msgid ""
-"Specify the envelope sender used to send the emails. This is useful if your "
-"default address is not the address that is subscribed to a list. In order to "
-"use the 'From' address, set the value to \"auto\". If you use the sendmail "
-"binary, you must have suitable privileges for the -f parameter. Default is "
-"the value of the `sendemail.envelopeSender` configuration variable; if that "
-"is unspecified, choosing the envelope sender is left to your MTA."
+#, priority:100
+msgid "Specify the envelope sender used to send the emails. This is useful if your default address is not the address that is subscribed to a list. In order to use the 'From' address, set the value to \"auto\". If you use the sendmail binary, you must have suitable privileges for the -f parameter. Default is the value of the `sendemail.envelopeSender` configuration variable; if that is unspecified, choosing the envelope sender is left to your MTA."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:170
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-encryption=<encryption>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:174
-msgid ""
-"Specify the encryption to use, either 'ssl' or 'tls'. Any other value "
-"reverts to plain SMTP. Default is the value of `sendemail.smtpEncryption`."
+#, priority:100
+msgid "Specify the encryption to use, either 'ssl' or 'tls'. Any other value reverts to plain SMTP. Default is the value of `sendemail.smtpEncryption`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:175
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-domain=<FQDN>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:181
-msgid ""
-"Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO "
-"command to the SMTP server. Some servers require the FQDN to match your IP "
-"address. If not set, git send-email attempts to determine your FQDN "
-"automatically. Default is the value of `sendemail.smtpDomain`."
+#, priority:100
+msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server. Some servers require the FQDN to match your IP address. If not set, git send-email attempts to determine your FQDN automatically. Default is the value of `sendemail.smtpDomain`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:182
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-auth=<mechanisms>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:185
-msgid ""
-"Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting "
-"forces using only the listed mechanisms. Example:"
+#, priority:100
+msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
msgstr ""
#. type: delimited block -
#: en/git-send-email.txt:188
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:196
-msgid ""
-"If at least one of the specified mechanisms matches the ones advertised by "
-"the SMTP server and if it is supported by the utilized SASL library, the "
-"mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor "
-"`--smtp-auth` is specified, all mechanisms supported by the SASL library can "
-"be used. The special value 'none' maybe specified to completely disable "
-"authentication independently of `--smtp-user`"
+#, priority:100
+msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:197
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-pass[=<password>]"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:202
-msgid ""
-"Password for SMTP-AUTH. The argument is optional: If no argument is "
-"specified, then the empty string is used as the password. Default is the "
-"value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this "
-"value."
+#, priority:100
+msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:208
-msgid ""
-"Furthermore, passwords need not be specified in configuration files or on "
-"the command line. If a username has been specified (with `--smtp-user` or a "
-"`sendemail.smtpUser`), but no password has been specified (with "
-"`--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using "
-"'git-credential'."
+#, priority:100
+msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:209
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-smtp-auth"
msgstr "--no-smtp-auth"
#. type: Plain text
#: en/git-send-email.txt:211
+#, priority:100
msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:212
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-server=<host>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:221
-msgid ""
-"If set, specifies the outgoing SMTP server to use (e.g. `smtp.example.com` "
-"or a raw IP address). Alternatively it can specify a full pathname of a "
-"sendmail-like program instead; the program must support the `-i` option. "
-"Default value can be specified by the `sendemail.smtpServer` configuration "
-"option; the built-in default is to search for `sendmail` in `/usr/sbin`, "
-"`/usr/lib` and $PATH if such program is available, falling back to "
-"`localhost` otherwise."
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server to use (e.g. `smtp.example.com` or a raw IP address). Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:222
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-server-port=<port>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:229
-msgid ""
-"Specifies a port different from the default port (SMTP servers typically "
-"listen to smtp port 25, but may also listen to submission port 587, or the "
-"common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead "
-"of 587) are also accepted. The port can also be set with the "
-"`sendemail.smtpServerPort` configuration variable."
+#, priority:100
+msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587) are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:230
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-server-option=<option>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:234
-msgid ""
-"If set, specifies the outgoing SMTP server option to use. Default value can "
-"be specified by the `sendemail.smtpServerOption` configuration option."
+#, priority:100
+msgid "If set, specifies the outgoing SMTP server option to use. Default value can be specified by the `sendemail.smtpServerOption` configuration option."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:238
-msgid ""
-"The --smtp-server-option option must be repeated for each option you want to "
-"pass to the server. Likewise, different lines in the configuration files "
-"must be used for each option."
+#, priority:100
+msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:239
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--smtp-ssl"
msgstr "--smtp-ssl"
#. type: Plain text
#: en/git-send-email.txt:241
+#, priority:100
msgid "Legacy alias for '--smtp-encryption ssl'."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:242
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--smtp-ssl-cert-path"
msgstr "--smtp-ssl-cert-path"
#. type: Plain text
#: en/git-send-email.txt:252
-msgid ""
-"Path to a store of trusted CA certificates for SMTP SSL/TLS certificate "
-"validation (either a directory that has been processed by 'c_rehash', or a "
-"single file containing one or more PEM format certificates concatenated "
-"together: see verify(1) -CAfile and -CApath for more information on "
-"these). Set it to an empty string to disable certificate "
-"verification. Defaults to the value of the `sendemail.smtpsslcertpath` "
-"configuration variable, if set, or the backing SSL library's compiled-in "
-"default otherwise (which should be the best choice on most platforms)."
+#, priority:100
+msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:253
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-user=<user>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:257
-msgid ""
-"Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a "
-"username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then "
-"authentication is not attempted."
+#, priority:100
+msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:258
-#, no-wrap
+#, no-wrap, priority:100
msgid "--smtp-debug=0|1"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:262
-msgid ""
-"Enable (1) or disable (0) debug output. If enabled, SMTP commands and "
-"replies will be printed. Useful to debug TLS connection and authentication "
-"problems."
+#, priority:100
+msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:263
-#, no-wrap
+#, no-wrap, priority:100
msgid "--batch-size=<num>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:272
-msgid ""
-"Some email servers (e.g. smtp.163.com) limit the number emails to be sent "
-"per session (connection) and this will lead to a failure when sending many "
-"messages. With this option, send-email will disconnect after sending $<num> "
-"messages and wait for a few seconds (see --relogin-delay) and reconnect, to "
-"work around such a limit. You may want to use some form of credential "
-"helper to avoid having to retype your password every time this happens. "
-"Defaults to the `sendemail.smtpBatchSize` configuration variable."
+#, priority:100
+msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages. With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay) and reconnect, to work around such a limit. You may want to use some form of credential helper to avoid having to retype your password every time this happens. Defaults to the `sendemail.smtpBatchSize` configuration variable."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:273
-#, no-wrap
+#, no-wrap, priority:100
msgid "--relogin-delay=<int>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:277
-msgid ""
-"Waiting $<int> seconds before reconnecting to SMTP server. Used together "
-"with --batch-size option. Defaults to the `sendemail.smtpReloginDelay` "
-"configuration variable."
+#, priority:100
+msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option. Defaults to the `sendemail.smtpReloginDelay` configuration variable."
msgstr ""
#. type: Title ~
#: en/git-send-email.txt:279
-#, no-wrap
+#, no-wrap, priority:100
msgid "Automating"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:281
-#, no-wrap
+#, no-wrap, priority:100
msgid "--no-[to|cc|bcc]"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:284
-msgid ""
-"Clears any list of \"To:\", \"Cc:\", \"Bcc:\" addresses previously set via "
-"config."
+#, priority:100
+msgid "Clears any list of \"To:\", \"Cc:\", \"Bcc:\" addresses previously set via config."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-identity"
msgstr "--no-identity"
#. type: Plain text
#: en/git-send-email.txt:288
-msgid ""
-"Clears the previously read value of `sendemail.identity` set via config, if "
-"any."
+#, priority:100
+msgid "Clears the previously read value of `sendemail.identity` set via config, if any."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:289
-#, no-wrap
+#, no-wrap, priority:100
msgid "--to-cmd=<command>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:294
-msgid ""
-"Specify a command to execute once per patch file which should generate patch "
-"file specific \"To:\" entries. Output of this command must be single email "
-"address per line. Default is the value of 'sendemail.tocmd' configuration "
-"value."
+#, priority:100
+msgid "Specify a command to execute once per patch file which should generate patch file specific \"To:\" entries. Output of this command must be single email address per line. Default is the value of 'sendemail.tocmd' configuration value."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:295
-#, no-wrap
+#, no-wrap, priority:100
msgid "--cc-cmd=<command>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:300
-msgid ""
-"Specify a command to execute once per patch file which should generate patch "
-"file specific \"Cc:\" entries. Output of this command must be single email "
-"address per line. Default is the value of `sendemail.ccCmd` configuration "
-"value."
+#, priority:100
+msgid "Specify a command to execute once per patch file which should generate patch file specific \"Cc:\" entries. Output of this command must be single email address per line. Default is the value of `sendemail.ccCmd` configuration value."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:301
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
#. type: Plain text
#: en/git-send-email.txt:308
-msgid ""
-"If this is set, each email will be sent as a reply to the previous email "
-"sent. If disabled with \"--no-chain-reply-to\", all emails after the first "
-"will be sent as replies to the first email sent. When using this, it is "
-"recommended that the first file given be an overview of the entire patch "
-"series. Disabled by default, but the `sendemail.chainReplyTo` configuration "
-"variable can be used to enable it."
+#, priority:100
+msgid "If this is set, each email will be sent as a reply to the previous email sent. If disabled with \"--no-chain-reply-to\", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the entire patch series. Disabled by default, but the `sendemail.chainReplyTo` configuration variable can be used to enable it."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:309
-#, no-wrap
+#, no-wrap, priority:100
msgid "--identity=<identity>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:314
-msgid ""
-"A configuration identity. When given, causes values in the "
-"'sendemail.<identity>' subsection to take precedence over values in the "
-"'sendemail' section. The default identity is the value of "
-"`sendemail.identity`."
+#, priority:100
+msgid "A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is the value of `sendemail.identity`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:315
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]signed-off-by-cc"
msgstr "--[no-]signed-off-by-cc"
#. type: Plain text
#: en/git-send-email.txt:319
-msgid ""
-"If this is set, add emails found in Signed-off-by: or Cc: lines to the cc "
-"list. Default is the value of `sendemail.signedoffbycc` configuration value; "
-"if that is unspecified, default to --signed-off-by-cc."
+#, priority:100
+msgid "If this is set, add emails found in Signed-off-by: or Cc: lines to the cc list. Default is the value of `sendemail.signedoffbycc` configuration value; if that is unspecified, default to --signed-off-by-cc."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:320
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cc-cover"
msgstr "--[no-]cc-cover"
#. type: Plain text
#: en/git-send-email.txt:325
-msgid ""
-"If this is set, emails found in Cc: headers in the first patch of the series "
-"(typically the cover letter) are added to the cc list for each email "
-"set. Default is the value of 'sendemail.cccover' configuration value; if "
-"that is unspecified, default to --no-cc-cover."
+#, priority:100
+msgid "If this is set, emails found in Cc: headers in the first patch of the series (typically the cover letter) are added to the cc list for each email set. Default is the value of 'sendemail.cccover' configuration value; if that is unspecified, default to --no-cc-cover."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:326
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]to-cover"
msgstr "--[no-]to-cover"
#. type: Plain text
#: en/git-send-email.txt:331
-msgid ""
-"If this is set, emails found in To: headers in the first patch of the series "
-"(typically the cover letter) are added to the to list for each email "
-"set. Default is the value of 'sendemail.tocover' configuration value; if "
-"that is unspecified, default to --no-to-cover."
+#, priority:100
+msgid "If this is set, emails found in To: headers in the first patch of the series (typically the cover letter) are added to the to list for each email set. Default is the value of 'sendemail.tocover' configuration value; if that is unspecified, default to --no-to-cover."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:332
-#, no-wrap
+#, no-wrap, priority:100
msgid "--suppress-cc=<category>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:335
+#, priority:100
msgid "Specify an additional category of recipients to suppress the auto-cc of:"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:338
+#, priority:100
msgid "'author' will avoid including the patch author."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:339
+#, priority:100
msgid "'self' will avoid including the sender."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:341
-msgid ""
-"'cc' will avoid including anyone mentioned in Cc lines in the patch header "
-"except for self (use 'self' for that)."
+#, priority:100
+msgid "'cc' will avoid including anyone mentioned in Cc lines in the patch header except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:343
-msgid ""
-"'bodycc' will avoid including anyone mentioned in Cc lines in the patch body "
-"(commit message) except for self (use 'self' for that)."
+#, priority:100
+msgid "'bodycc' will avoid including anyone mentioned in Cc lines in the patch body (commit message) except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:345
-msgid ""
-"'sob' will avoid including anyone mentioned in Signed-off-by lines except "
-"for self (use 'self' for that)."
+#, priority:100
+msgid "'sob' will avoid including anyone mentioned in Signed-off-by lines except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:348
-msgid ""
-"'misc-by' will avoid including anyone mentioned in Acked-by, Reviewed-by, "
-"Tested-by and other \"-by\" lines in the patch body, except Signed-off-by "
-"(use 'sob' for that)."
+#, priority:100
+msgid "'misc-by' will avoid including anyone mentioned in Acked-by, Reviewed-by, Tested-by and other \"-by\" lines in the patch body, except Signed-off-by (use 'sob' for that)."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:349
+#, priority:100
msgid "'cccmd' will avoid running the --cc-cmd."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:350
+#, priority:100
msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:351
+#, priority:100
msgid "'all' will suppress all auto cc values."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:356
-msgid ""
-"Default is the value of `sendemail.suppresscc` configuration value; if that "
-"is unspecified, default to 'self' if --suppress-from is specified, as well "
-"as 'body' if --no-signed-off-cc is specified."
+#, priority:100
+msgid "Default is the value of `sendemail.suppresscc` configuration value; if that is unspecified, default to 'self' if --suppress-from is specified, as well as 'body' if --no-signed-off-cc is specified."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:357
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
#. type: Plain text
#: en/git-send-email.txt:361
-msgid ""
-"If this is set, do not add the From: address to the cc: list. Default is "
-"the value of `sendemail.suppressFrom` configuration value; if that is "
-"unspecified, default to --no-suppress-from."
+#, priority:100
+msgid "If this is set, do not add the From: address to the cc: list. Default is the value of `sendemail.suppressFrom` configuration value; if that is unspecified, default to --no-suppress-from."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:362
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]thread"
msgstr "--[no-]thread"
#. type: Plain text
#: en/git-send-email.txt:368
-msgid ""
-"If this is set, the In-Reply-To and References headers will be added to each "
-"email sent. Whether each mail refers to the previous email (`deep` "
-"threading per 'git format-patch' wording) or to the first email (`shallow` "
-"threading) is governed by \"--[no-]chain-reply-to\"."
+#, priority:100
+msgid "If this is set, the In-Reply-To and References headers will be added to each email sent. Whether each mail refers to the previous email (`deep` threading per 'git format-patch' wording) or to the first email (`shallow` threading) is governed by \"--[no-]chain-reply-to\"."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:373
-msgid ""
-"If disabled with \"--no-thread\", those headers will not be added (unless "
-"specified with --in-reply-to). Default is the value of the "
-"`sendemail.thread` configuration value; if that is unspecified, default to "
-"--thread."
+#, priority:100
+msgid "If disabled with \"--no-thread\", those headers will not be added (unless specified with --in-reply-to). Default is the value of the `sendemail.thread` configuration value; if that is unspecified, default to --thread."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:379
-msgid ""
-"It is up to the user to ensure that no In-Reply-To header already exists "
-"when 'git send-email' is asked to add it (especially note that 'git "
-"format-patch' can be configured to do the threading itself). Failure to do "
-"so may not produce the expected result in the recipient's MUA."
+#, priority:100
+msgid "It is up to the user to ensure that no In-Reply-To header already exists when 'git send-email' is asked to add it (especially note that 'git format-patch' can be configured to do the threading itself). Failure to do so may not produce the expected result in the recipient's MUA."
msgstr ""
#. type: Title ~
#: en/git-send-email.txt:382
-#, no-wrap
+#, no-wrap, priority:100
msgid "Administering"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:384
-#, no-wrap
+#, no-wrap, priority:100
msgid "--confirm=<mode>"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:386
+#, priority:100
msgid "Confirm just before sending:"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:389
+#, priority:100
msgid "'always' will always confirm before sending"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:390
+#, priority:100
msgid "'never' will never confirm before sending"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:392
-msgid ""
-"'cc' will confirm before sending when send-email has automatically added "
-"addresses from the patch to the Cc list"
+#, priority:100
+msgid "'cc' will confirm before sending when send-email has automatically added addresses from the patch to the Cc list"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:393
-msgid ""
-"'compose' will confirm before sending the first message when using "
-"--compose."
+#, priority:100
+msgid "'compose' will confirm before sending the first message when using --compose."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:394
+#, priority:100
msgid "'auto' is equivalent to 'cc' + 'compose'"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:399
-msgid ""
-"Default is the value of `sendemail.confirm` configuration value; if that is "
-"unspecified, default to 'auto' unless any of the suppress options have been "
-"specified, in which case default to 'compose'."
+#, priority:100
+msgid "Default is the value of `sendemail.confirm` configuration value; if that is unspecified, default to 'auto' unless any of the suppress options have been specified, in which case default to 'compose'."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:402
+#, priority:100
msgid "Do everything except actually send the emails."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:403
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]format-patch"
msgstr "--[no-]format-patch"
#. type: Plain text
#: en/git-send-email.txt:408
-msgid ""
-"When an argument may be understood either as a reference or as a file name, "
-"choose to understand it as a format-patch argument (`--format-patch`) or as "
-"a file name (`--no-format-patch`). By default, when such a conflict occurs, "
-"git send-email will fail."
+#, priority:100
+msgid "When an argument may be understood either as a reference or as a file name, choose to understand it as a format-patch argument (`--format-patch`) or as a file name (`--no-format-patch`). By default, when such a conflict occurs, git send-email will fail."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:412
-msgid ""
-"Make git-send-email less verbose. One line per email should be all that is "
-"output."
+#, priority:100
+msgid "Make git-send-email less verbose. One line per email should be all that is output."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:413
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]validate"
msgstr "--[no-]validate"
#. type: Plain text
#: en/git-send-email.txt:416
-msgid ""
-"Perform sanity checks on patches. Currently, validation means the "
-"following:"
+#, priority:100
+msgid "Perform sanity checks on patches. Currently, validation means the following:"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:419
+#, priority:100
msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:420
+#, priority:100
msgid "Warn of patches that contain lines longer than"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:424
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"998 characters unless a suitable transfer encoding\n"
"('auto', 'base64', or 'quoted-printable') is used;\n"
@@ -52902,164 +45281,151 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:428
-msgid ""
-"Default is the value of `sendemail.validate`; if this is not set, default to "
-"`--validate`."
+#, priority:100
+msgid "Default is the value of `sendemail.validate`; if this is not set, default to `--validate`."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:431
+#, priority:100
msgid "Send emails even if safety checks would prevent it."
msgstr ""
#. type: Title ~
#: en/git-send-email.txt:434
-#, no-wrap
+#, no-wrap, priority:100
msgid "Information"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:436
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--dump-aliases"
msgstr "--dump-aliases"
#. type: Plain text
#: en/git-send-email.txt:441
-msgid ""
-"Instead of the normal operation, dump the shorthand alias names from the "
-"configured alias file(s), one per line in alphabetical order. Note, this "
-"only includes the alias name and not its expanded email addresses. See "
-"'sendemail.aliasesfile' for more information about aliases."
+#, priority:100
+msgid "Instead of the normal operation, dump the shorthand alias names from the configured alias file(s), one per line in alphabetical order. Note, this only includes the alias name and not its expanded email addresses. See 'sendemail.aliasesfile' for more information about aliases."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:446
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "sendemail.aliasesFile"
msgstr "sendemail.aliasesFile"
#. type: Plain text
#: en/git-send-email.txt:449
-msgid ""
-"To avoid typing long email addresses, point this to one or more email "
-"aliases files. You must also supply `sendemail.aliasFileType`."
+#, priority:100
+msgid "To avoid typing long email addresses, point this to one or more email aliases files. You must also supply `sendemail.aliasFileType`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:450
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "sendemail.aliasFileType"
msgstr "sendemail.aliasFileType"
#. type: Plain text
#: en/git-send-email.txt:453
-msgid ""
-"Format of the file(s) specified in sendemail.aliasesFile. Must be one of "
-"'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'."
+#, priority:100
+msgid "Format of the file(s) specified in sendemail.aliasesFile. Must be one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:458
-msgid ""
-"What an alias file in each format looks like can be found in the "
-"documentation of the email program of the same name. The differences and "
-"limitations from the standard formats are described below:"
+#, priority:100
+msgid "What an alias file in each format looks like can be found in the documentation of the email program of the same name. The differences and limitations from the standard formats are described below:"
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:460
-#, no-wrap
+#, no-wrap, priority:100
msgid "sendmail"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:462
+#, priority:100
msgid "Quoted aliases and quoted addresses are not supported: lines that"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:463
+#, priority:100
msgid "contain a `\"` symbol are ignored."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:464
+#, priority:100
msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:465
+#, priority:100
msgid "supported."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:466
+#, priority:100
msgid "File inclusion (`:include: /path/name`) is not supported."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:467
+#, priority:100
msgid "Warnings are printed on the standard error output for any"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:469
-msgid ""
-"explicitly unsupported constructs, and any other lines that are not "
-"recognized by the parser."
+#, priority:100
+msgid "explicitly unsupported constructs, and any other lines that are not recognized by the parser."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:471
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "sendemail.multiEdit"
msgstr "sendemail.multiEdit"
#. type: Plain text
#: en/git-send-email.txt:476
-msgid ""
-"If true (default), a single editor instance will be spawned to edit files "
-"you have to edit (patches when `--annotate` is used, and the summary when "
-"`--compose` is used). If false, files will be edited one after the other, "
-"spawning a new editor each time."
+#, priority:100
+msgid "If true (default), a single editor instance will be spawned to edit files you have to edit (patches when `--annotate` is used, and the summary when `--compose` is used). If false, files will be edited one after the other, spawning a new editor each time."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:477
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "sendemail.confirm"
msgstr "sendemail.confirm"
#. type: Plain text
#: en/git-send-email.txt:481
-msgid ""
-"Sets the default for whether to confirm before sending. Must be one of "
-"'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm` in the "
-"previous section for the meaning of these values."
+#, priority:100
+msgid "Sets the default for whether to confirm before sending. Must be one of 'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm` in the previous section for the meaning of these values."
msgstr ""
#. type: Title ~
#: en/git-send-email.txt:485
-#, no-wrap
+#, no-wrap, priority:100
msgid "Use gmail as the smtp server"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:488
-msgid ""
-"To use 'git send-email' to send your patches through the GMail SMTP server, "
-"edit ~/.gitconfig to specify your account settings:"
+#, priority:100
+msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
#. type: delimited block -
#: en/git-send-email.txt:495
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[sendemail]\n"
"\tsmtpEncryption = tls\n"
@@ -53070,23 +45436,19 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:500
-msgid ""
-"If you have multifactor authentication setup on your gmail account, you will "
-"need to generate an app-specific password for use with 'git "
-"send-email'. Visit "
-"https://security.google.com/settings/security/apppasswords to create it."
+#, priority:100
+msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:503
-msgid ""
-"Once your commits are ready to be sent to the mailing list, run the "
-"following commands:"
+#, priority:100
+msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:507
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t$ git format-patch --cover-letter -M origin/master -o outgoing/\n"
"\t$ edit outgoing/0000-*\n"
@@ -53095,47 +45457,39 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:512
-msgid ""
-"The first time you run it, you will be prompted for your credentials. Enter "
-"the app-specific or your regular password as appropriate. If you have "
-"credential helper configured (see linkgit:git-credential[1]), the password "
-"will be saved in the credential store so you won't have to type it the next "
-"time."
+#, priority:100
+msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:518
-msgid ""
-"Note: the following core Perl modules that may be installed with your "
-"distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, "
-"Net::Domain and Net::SMTP. These additional Perl modules are also required: "
-"Authen::SASL and Mail::Address."
+#, priority:100
+msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:523
+#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr ""
#. type: Title =
#: en/git-send-pack.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-send-pack(1)"
msgstr "git-send-pack(1)"
#. type: Plain text
#: en/git-send-pack.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-send-pack - Push objects over Git protocol to another repository"
msgstr "Empujar objetos por protocolo Git a otro repositorio"
#. type: Plain text
#: en/git-send-pack.txt:16
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git send-pack' [--all] [--dry-run] [--force] "
-"[--receive-pack=<git-receive-pack>]\n"
+"'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]\n"
"\t\t[--verbose] [--thin] [--atomic]\n"
"\t\t[--[no-]signed|--signed=(true|false|if-asked)]\n"
"\t\t[<host>:]<directory> [<ref>...]\n"
@@ -53143,144 +45497,127 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:21
-msgid ""
-"Usually you would want to use 'git push', which is a higher-level wrapper of "
-"this command, instead. See linkgit:git-push[1]."
+#, priority:100
+msgid "Usually you would want to use 'git push', which is a higher-level wrapper of this command, instead. See linkgit:git-push[1]."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:24
-msgid ""
-"Invokes 'git-receive-pack' on a possibly remote repository, and updates it "
-"from the current repository, sending named refs."
+#, priority:100
+msgid "Invokes 'git-receive-pack' on a possibly remote repository, and updates it from the current repository, sending named refs."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:36
+#, priority:100
msgid "Same as --receive-pack=<git-receive-pack>."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:40
-msgid ""
-"Instead of explicitly specifying which refs to update, update all heads that "
-"locally exist."
+#, priority:100
+msgid "Instead of explicitly specifying which refs to update, update all heads that locally exist."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:67
-msgid ""
-"Send a \"thin\" pack, which records objects in deltified form based on "
-"objects not included in the pack to reduce network traffic."
+#, priority:100
+msgid "Send a \"thin\" pack, which records objects in deltified form based on objects not included in the pack to reduce network traffic."
msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--atomic"
msgstr "--atomic"
#. type: Plain text
#: en/git-send-pack.txt:72
-msgid ""
-"Use an atomic transaction for updating the refs. If any of the refs fails to "
-"update then the entire push will fail without changing any refs."
+#, priority:100
+msgid "Use an atomic transaction for updating the refs. If any of the refs fails to update then the entire push will fail without changing any refs."
msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:84
-#, no-wrap
+#, no-wrap, priority:100
msgid "--push-option=<string>"
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:89
-msgid ""
-"Pass the specified string as a push option for consumption by hooks on the "
-"server side. If the server doesn't support push options, error out. See "
-"linkgit:git-push[1] and linkgit:githooks[5] for details."
+#, priority:100
+msgid "Pass the specified string as a push option for consumption by hooks on the server side. If the server doesn't support push options, error out. See linkgit:git-push[1] and linkgit:githooks[5] for details."
msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:90
-#, no-wrap
+#, no-wrap, priority:100
msgid "<host>"
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:94
-msgid ""
-"A remote host to house the repository. When this part is specified, "
-"'git-receive-pack' is invoked via ssh."
+#, priority:100
+msgid "A remote host to house the repository. When this part is specified, 'git-receive-pack' is invoked via ssh."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:97
+#, priority:100
msgid "The repository to update."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:107
+#, priority:100
msgid "There are three ways to specify which refs to update on the remote end."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:111
-msgid ""
-"With `--all` flag, all refs that exist locally are transferred to the remote "
-"side. You cannot specify any '<ref>' if you use this flag."
+#, priority:100
+msgid "With `--all` flag, all refs that exist locally are transferred to the remote side. You cannot specify any '<ref>' if you use this flag."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:114
-msgid ""
-"Without `--all` and without any '<ref>', the heads that exist both on the "
-"local side and on the remote side are updated."
+#, priority:100
+msgid "Without `--all` and without any '<ref>', the heads that exist both on the local side and on the remote side are updated."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:120
-msgid ""
-"When one or more '<ref>' are specified explicitly (whether on the command "
-"line or via `--stdin`), it can be either a single pattern, or a pair of such "
-"pattern separated by a colon \":\" (this means that a ref name cannot have a "
-"colon in it). A single pattern '<name>' is just a shorthand for "
-"'<name>:<name>'."
+#, priority:100
+msgid "When one or more '<ref>' are specified explicitly (whether on the command line or via `--stdin`), it can be either a single pattern, or a pair of such pattern separated by a colon \":\" (this means that a ref name cannot have a colon in it). A single pattern '<name>' is just a shorthand for '<name>:<name>'."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:128
-msgid ""
-"Each pattern pair consists of the source side (before the colon) and the "
-"destination side (after the colon). The ref to be pushed is determined by "
-"finding a match that matches the source side, and where it is pushed is "
-"determined by using the destination side. The rules used to match a ref are "
-"the same rules used by 'git rev-parse' to resolve a symbolic ref name. See "
-"linkgit:git-rev-parse[1]."
+#, priority:100
+msgid "Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side. The rules used to match a ref are the same rules used by 'git rev-parse' to resolve a symbolic ref name. See linkgit:git-rev-parse[1]."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:133
+#, priority:100
msgid "It is an error if <dst> matches more than one remote refs."
msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-shell(1)"
msgstr "git-shell(1)"
#. type: Plain text
#: en/git-shell.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-shell - Restricted login shell for Git-only SSH access"
msgstr "Shell de inicio de sesi처n restringido para acceso SSH exclusivo de Git"
#. type: Plain text
#: en/git-shell.txt:15
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'chsh' -s $(command -v git-shell) <user>\n"
"'git clone' <user>`@localhost:/path/to/repo.git`\n"
@@ -53289,116 +45626,103 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:23
-msgid ""
-"This is a login shell for SSH accounts to provide restricted Git access. It "
-"permits execution only of server-side Git commands implementing the "
-"pull/push functionality, plus custom commands present in a subdirectory "
-"named `git-shell-commands` in the user's home directory."
+#, priority:100
+msgid "This is a login shell for SSH accounts to provide restricted Git access. It permits execution only of server-side Git commands implementing the pull/push functionality, plus custom commands present in a subdirectory named `git-shell-commands` in the user's home directory."
msgstr ""
#. type: Plain text
#: en/git-shell.txt:28
+#, priority:100
msgid "'git shell' accepts the following commands after the `-c` option:"
msgstr ""
#. type: Labeled list
#: en/git-shell.txt:29
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git receive-pack <argument>'"
msgstr ""
#. type: Labeled list
#: en/git-shell.txt:30
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git upload-pack <argument>'"
msgstr ""
#. type: Labeled list
#: en/git-shell.txt:31
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git upload-archive <argument>'"
msgstr ""
#. type: Plain text
#: en/git-shell.txt:35
-msgid ""
-"Call the corresponding server-side command to support the client's 'git "
-"push', 'git fetch', or 'git archive --remote' request."
+#, priority:100
+msgid "Call the corresponding server-side command to support the client's 'git push', 'git fetch', or 'git archive --remote' request."
msgstr ""
#. type: Labeled list
#: en/git-shell.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid "'cvs server'"
msgstr ""
#. type: Plain text
#: en/git-shell.txt:37
+#, priority:100
msgid "Imitate a CVS server. See linkgit:git-cvsserver[1]."
msgstr ""
#. type: Plain text
#: en/git-shell.txt:42
-msgid ""
-"If a `~/git-shell-commands` directory is present, 'git shell' will also "
-"handle other, custom commands by running \"`git-shell-commands/<command> "
-"<arguments>`\" from the user's home directory."
+#, priority:100
+msgid "If a `~/git-shell-commands` directory is present, 'git shell' will also handle other, custom commands by running \"`git-shell-commands/<command> <arguments>`\" from the user's home directory."
msgstr ""
#. type: Title -
#: en/git-shell.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "INTERACTIVE USE"
msgstr ""
#. type: Plain text
#: en/git-shell.txt:48
-msgid ""
-"By default, the commands above can be executed only with the `-c` option; "
-"the shell is not interactive."
+#, priority:100
+msgid "By default, the commands above can be executed only with the `-c` option; the shell is not interactive."
msgstr ""
#. type: Plain text
#: en/git-shell.txt:56
-msgid ""
-"If a `~/git-shell-commands` directory is present, 'git shell' can also be "
-"run interactively (with no arguments). If a `help` command is present in "
-"the `git-shell-commands` directory, it is run to provide the user with an "
-"overview of allowed actions. Then a \"git> \" prompt is presented at which "
-"one can enter any of the commands from the `git-shell-commands` directory, "
-"or `exit` to close the connection."
+#, priority:100
+msgid "If a `~/git-shell-commands` directory is present, 'git shell' can also be run interactively (with no arguments). If a `help` command is present in the `git-shell-commands` directory, it is run to provide the user with an overview of allowed actions. Then a \"git> \" prompt is presented at which one can enter any of the commands from the `git-shell-commands` directory, or `exit` to close the connection."
msgstr ""
#. type: Plain text
#: en/git-shell.txt:61
-msgid ""
-"Generally this mode is used as an administrative interface to allow users to "
-"list repositories they have access to, create, delete, or rename "
-"repositories, or change repository descriptions and permissions."
+#, priority:100
+msgid "Generally this mode is used as an administrative interface to allow users to list repositories they have access to, create, delete, or rename repositories, or change repository descriptions and permissions."
msgstr ""
#. type: Plain text
#: en/git-shell.txt:64
-msgid ""
-"If a `no-interactive-login` command exists, then it is run and the "
-"interactive shell is aborted."
+#, priority:100
+msgid "If a `no-interactive-login` command exists, then it is run and the interactive shell is aborted."
msgstr ""
#. type: Plain text
#: en/git-shell.txt:69
+#, priority:100
msgid "To disable interactive logins, displaying a greeting instead:"
msgstr ""
#. type: delimited block -
#: en/git-shell.txt:80
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ chsh -s /usr/bin/git-shell\n"
"$ mkdir $HOME/git-shell-commands\n"
"$ cat >$HOME/git-shell-commands/no-interactive-login <<\\EOF\n"
"#!/bin/sh\n"
-"printf '%s\\n' \"Hi $USER! You've successfully authenticated, but I do "
-"not\"\n"
+"printf '%s\\n' \"Hi $USER! You've successfully authenticated, but I do not\"\n"
"printf '%s\\n' \"provide interactive shell access.\"\n"
"exit 128\n"
"EOF\n"
@@ -53407,15 +45731,13 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:85
-msgid ""
-"To enable git-cvsserver access (which should generally have the "
-"`no-interactive-login` example above as a prerequisite, as creating the "
-"git-shell-commands directory allows interactive logins):"
+#, priority:100
+msgid "To enable git-cvsserver access (which should generally have the `no-interactive-login` example above as a prerequisite, as creating the git-shell-commands directory allows interactive logins):"
msgstr ""
#. type: delimited block -
#: en/git-shell.txt:96
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ cat >$HOME/git-shell-commands/cvs <<\\EOF\n"
"if ! test $# = 1 && test \"$1\" = \"server\"\n"
@@ -53430,23 +45752,25 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:103
+#, priority:100
msgid "ssh(1), linkgit:git-daemon[1], contrib/git-shell-commands/README"
msgstr ""
#. type: Title =
#: en/git-sh-i18n--envsubst.txt:2
-#, no-wrap
+#, no-wrap, priority:100
msgid "git-sh-i18n{litdd}envsubst(1)"
msgstr ""
#. type: Plain text
#: en/git-sh-i18n--envsubst.txt:7
+#, priority:100
msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
msgstr ""
#. type: Plain text
#: en/git-sh-i18n--envsubst.txt:17
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"eval_gettext () {\n"
"\tprintf \"%s\" \"$1\" | (\n"
@@ -53458,100 +45782,85 @@ msgstr ""
#. type: Plain text
#: en/git-sh-i18n--envsubst.txt:24
-msgid ""
-"This is not a command the end user would want to run. Ever. This "
-"documentation is meant for people who are studying the plumbing scripts "
-"and/or are writing new ones."
+#, priority:100
+msgid "This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the plumbing scripts and/or are writing new ones."
msgstr ""
#. type: Plain text
#: en/git-sh-i18n--envsubst.txt:29
-msgid ""
-"'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU "
-"`envsubst(1)` program that comes with the GNU gettext package. It's used "
-"internally by linkgit:git-sh-i18n[1] to interpolate the variables passed to "
-"the `eval_gettext` function."
+#, priority:100
+msgid "'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU `envsubst(1)` program that comes with the GNU gettext package. It's used internally by linkgit:git-sh-i18n[1] to interpolate the variables passed to the `eval_gettext` function."
msgstr ""
#. type: Plain text
#: en/git-sh-i18n--envsubst.txt:33
-msgid ""
-"No promises are made about the interface, or that this program won't "
-"disappear without warning in the next version of Git. Don't use it."
+#, priority:100
+msgid "No promises are made about the interface, or that this program won't disappear without warning in the next version of Git. Don't use it."
msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-sh-i18n(1)"
msgstr "git-sh-i18n(1)"
#. type: Plain text
#: en/git-sh-i18n.txt:7
+#, priority:100
msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
msgstr ""
#. type: Plain text
#: en/git-sh-i18n.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
msgstr ""
#. type: Plain text
#: en/git-sh-i18n.txt:26
-msgid ""
-"The 'git sh-i18n scriptlet is designed to be sourced (using `.`) by Git's "
-"porcelain programs implemented in shell script. It provides wrappers for the "
-"GNU `gettext` and `eval_gettext` functions accessible through the "
-"`gettext.sh` script, and provides pass-through fallbacks on systems without "
-"GNU gettext."
+#, priority:100
+msgid "The 'git sh-i18n scriptlet is designed to be sourced (using `.`) by Git's porcelain programs implemented in shell script. It provides wrappers for the GNU `gettext` and `eval_gettext` functions accessible through the `gettext.sh` script, and provides pass-through fallbacks on systems without GNU gettext."
msgstr ""
#. type: Labeled list
#: en/git-sh-i18n.txt:30
-#, no-wrap
+#, no-wrap, priority:100
msgid "gettext"
msgstr ""
#. type: Plain text
#: en/git-sh-i18n.txt:34
-msgid ""
-"Currently a dummy fall-through function implemented as a wrapper around "
-"`printf(1)`. Will be replaced by a real gettext implementation in a later "
-"version."
+#, priority:100
+msgid "Currently a dummy fall-through function implemented as a wrapper around `printf(1)`. Will be replaced by a real gettext implementation in a later version."
msgstr ""
#. type: Labeled list
#: en/git-sh-i18n.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid "eval_gettext"
msgstr ""
#. type: Plain text
#: en/git-sh-i18n.txt:40
-msgid ""
-"Currently a dummy fall-through function implemented as a wrapper around "
-"`printf(1)` with variables expanded by the "
-"linkgit:git-sh-i18n{litdd}envsubst[1] helper. Will be replaced by a real "
-"gettext implementation in a later version."
+#, priority:100
+msgid "Currently a dummy fall-through function implemented as a wrapper around `printf(1)` with variables expanded by the linkgit:git-sh-i18n{litdd}envsubst[1] helper. Will be replaced by a real gettext implementation in a later version."
msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "git-shortlog(1)"
msgstr "git-shortlog(1)"
#. type: Plain text
#: en/git-shortlog.txt:7
+#, priority:260
msgid "git-shortlog - Summarize 'git log' output"
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git shortlog' [<options>] [<revision range>] [[--] <path>...]\n"
"git log --pretty=short | 'git shortlog' [<options>]\n"
@@ -53559,145 +45868,127 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:18
-msgid ""
-"Summarizes 'git log' output in a format suitable for inclusion in release "
-"announcements. Each commit will be grouped by author and title."
+#, priority:260
+msgid "Summarizes 'git log' output in a format suitable for inclusion in release announcements. Each commit will be grouped by author and title."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:20
+#, priority:260
msgid "Additionally, \"[PATCH]\" will be stripped from the commit description."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:25
-msgid ""
-"If no revisions are passed on the command line and either standard input is "
-"not a terminal or there is no current branch, 'git shortlog' will output a "
-"summary of the log read from standard input, without reference to the "
-"current repository."
+#, priority:260
+msgid "If no revisions are passed on the command line and either standard input is not a terminal or there is no current branch, 'git shortlog' will output a summary of the log read from standard input, without reference to the current repository."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:33
-msgid ""
-"Sort output according to the number of commits per author instead of author "
-"alphabetic order."
+#, priority:260
+msgid "Sort output according to the number of commits per author instead of author alphabetic order."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:37
+#, priority:260
msgid "Suppress commit description and provide a commit count summary only."
msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--email"
msgstr "--email"
#. type: Plain text
#: en/git-shortlog.txt:41
-#, fuzzy
+#, fuzzy, priority:260
msgid "Show the email address of each author."
msgstr "Mostrar la direcci처n de correo de cada autor"
#. type: Labeled list
#: en/git-shortlog.txt:42
-#, no-wrap
+#, no-wrap, priority:260
msgid "--format[=<format>]"
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:47
-msgid ""
-"Instead of the commit subject, use some other information to describe each "
-"commit. '<format>' can be any string accepted by the `--format` option of "
-"'git log', such as '* [%h] %s'. (See the \"PRETTY FORMATS\" section of "
-"linkgit:git-log[1].)"
+#, priority:260
+msgid "Instead of the commit subject, use some other information to describe each commit. '<format>' can be any string accepted by the `--format` option of 'git log', such as '* [%h] %s'. (See the \"PRETTY FORMATS\" section of linkgit:git-log[1].)"
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:49
+#, priority:260
msgid "Each pretty-printed commit will be rewrapped before it is shown."
msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--committer"
msgstr "--committer"
#. type: Plain text
#: en/git-shortlog.txt:53
+#, priority:260
msgid "Collect and show committer identities instead of authors."
msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:54
-#, no-wrap
+#, no-wrap, priority:260
msgid "-w[<width>[,<indent1>[,<indent2>]]]"
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:59
-msgid ""
-"Linewrap the output by wrapping each line at `width`. The first line of "
-"each entry is indented by `indent1` spaces, and the second and subsequent "
-"lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` "
-"default to 76, 6 and 9 respectively."
+#, priority:260
+msgid "Linewrap the output by wrapping each line at `width`. The first line of each entry is indented by `indent1` spaces, and the second and subsequent lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` default to 76, 6 and 9 respectively."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:62
-msgid ""
-"If width is `0` (zero) then indent the lines of the output without wrapping "
-"them."
+#, priority:260
+msgid "If width is `0` (zero) then indent the lines of the output without wrapping them."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:71
-msgid ""
-"Show only commits in the specified revision range. When no <revision range> "
-"is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
-"current commit). `origin..HEAD` specifies all the commits reachable from "
-"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list "
-"of ways to spell <revision range>, see the \"Specifying Ranges\" section of "
-"linkgit:gitrevisions[7]."
+#, priority:260
+msgid "Show only commits in the specified revision range. When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit). `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the \"Specifying Ranges\" section of linkgit:gitrevisions[7]."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:75
-msgid ""
-"Consider only commits that are enough to explain how the files that match "
-"the specified paths came to be."
+#, priority:260
+msgid "Consider only commits that are enough to explain how the files that match the specified paths came to be."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:88
-msgid ""
-"The `.mailmap` feature is used to coalesce together commits by the same "
-"person in the shortlog, where their name and/or email address was spelled "
-"differently."
+#, priority:260
+msgid "The `.mailmap` feature is used to coalesce together commits by the same person in the shortlog, where their name and/or email address was spelled differently."
msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-show-branch(1)"
msgstr "git-show-branch(1)"
#. type: Plain text
#: en/git-show-branch.txt:7
+#, priority:100
msgid "git-show-branch - Show branches and their commits"
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:17
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -53713,266 +46004,223 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:24
-msgid ""
-"Shows the commit ancestry graph starting from the commits named with <rev>s "
-"or <glob>s (or all refs under refs/heads and/or refs/tags) semi-visually."
+#, priority:100
+msgid "Shows the commit ancestry graph starting from the commits named with <rev>s or <glob>s (or all refs under refs/heads and/or refs/tags) semi-visually."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:26
+#, priority:100
msgid "It cannot show more than 29 branches and commits at a time."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:29
-msgid ""
-"It uses `showbranch.default` multi-valued configuration items if no <rev> or "
-"<glob> is given on the command line."
+#, priority:100
+msgid "It uses `showbranch.default` multi-valued configuration items if no <rev> or <glob> is given on the command line."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:33
-#, no-wrap
+#, no-wrap, priority:100
msgid "<rev>"
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:36
-msgid ""
-"Arbitrary extended SHA-1 expression (see linkgit:gitrevisions[7]) that "
-"typically names a branch head or a tag."
+#, priority:100
+msgid "Arbitrary extended SHA-1 expression (see linkgit:gitrevisions[7]) that typically names a branch head or a tag."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:37
-#, no-wrap
+#, no-wrap, priority:100
msgid "<glob>"
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:42
-msgid ""
-"A glob pattern that matches branch or tag names under refs/. For example, "
-"if you have many topic branches under refs/heads/topic, giving `topic/*` "
-"would show all of them."
+#, priority:100
+msgid "A glob pattern that matches branch or tag names under refs/. For example, if you have many topic branches under refs/heads/topic, giving `topic/*` would show all of them."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:46
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show the remote-tracking branches."
msgstr "mostrar ramas de rastreo remoto"
#. type: Plain text
#: en/git-show-branch.txt:50
+#, priority:100
msgid "Show both remote-tracking branches and local branches."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--current"
msgstr "--current"
#. type: Plain text
#: en/git-show-branch.txt:55
-msgid ""
-"With this option, the command includes the current branch to the list of "
-"revs to be shown when it is not given on the command line."
+#, priority:100
+msgid "With this option, the command includes the current branch to the list of revs to be shown when it is not given on the command line."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:656
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
#. type: Plain text
#: en/git-show-branch.txt:61
-msgid ""
-"By default, the branches and their commits are shown in reverse "
-"chronological order. This option makes them appear in topological order "
-"(i.e., descendant commits are shown before their parents)."
+#, priority:100
+msgid "By default, the branches and their commits are shown in reverse chronological order. This option makes them appear in topological order (i.e., descendant commits are shown before their parents)."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:648
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
#. type: Plain text
#: en/git-show-branch.txt:66
-msgid ""
-"This option is similar to `--topo-order` in the sense that no parent comes "
-"before all of its children, but otherwise commits are ordered according to "
-"their commit date."
+#, priority:100
+msgid "This option is similar to `--topo-order` in the sense that no parent comes before all of its children, but otherwise commits are ordered according to their commit date."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:71
-msgid ""
-"By default, the output omits merges that are reachable from only one tip "
-"being shown. This option makes them visible."
+#, priority:100
+msgid "By default, the output omits merges that are reachable from only one tip being shown. This option makes them visible."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:72
-#, no-wrap
+#, no-wrap, priority:100
msgid "--more=<n>"
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:79
-msgid ""
-"Usually the command stops output upon showing the commit that is the common "
-"ancestor of all the branches. This flag tells the command to go <n> more "
-"common commits beyond that. When <n> is negative, display only the "
-"<reference>s given, without showing the commit ancestry tree."
+#, priority:100
+msgid "Usually the command stops output upon showing the commit that is the common ancestor of all the branches. This flag tells the command to go <n> more common commits beyond that. When <n> is negative, display only the <reference>s given, without showing the commit ancestry tree."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:82
-#, fuzzy
+#, fuzzy, priority:100
msgid "Synonym to `--more=-1`"
msgstr "sin처nimo de m찼s=-1"
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--merge-base"
msgstr "--merge-base"
#. type: Plain text
#: en/git-show-branch.txt:89
-msgid ""
-"Instead of showing the commit list, determine possible merge bases for the "
-"specified commits. All merge bases will be contained in all specified "
-"commits. This is different from how linkgit:git-merge-base[1] handles the "
-"case of three or more commits."
+#, priority:100
+msgid "Instead of showing the commit list, determine possible merge bases for the specified commits. All merge bases will be contained in all specified commits. This is different from how linkgit:git-merge-base[1] handles the case of three or more commits."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:93
-msgid ""
-"Among the <reference>s given, display only the ones that cannot be reached "
-"from any other <reference>."
+#, priority:100
+msgid "Among the <reference>s given, display only the ones that cannot be reached from any other <reference>."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-name"
msgstr "--no-name"
#. type: Plain text
#: en/git-show-branch.txt:96
+#, priority:100
msgid "Do not show naming strings for each commit."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--sha1-name"
msgstr "--sha1-name"
#. type: Plain text
#: en/git-show-branch.txt:102
-msgid ""
-"Instead of naming the commits using the path to reach them from heads "
-"(e.g. \"master~2\" to mean the grandparent of \"master\"), name them with "
-"the unique prefix of their object names."
+#, priority:100
+msgid "Instead of naming the commits using the path to reach them from heads (e.g. \"master~2\" to mean the grandparent of \"master\"), name them with the unique prefix of their object names."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--topics"
msgstr "--topics"
#. type: Plain text
#: en/git-show-branch.txt:110
-msgid ""
-"Shows only commits that are NOT on the first branch given. This helps track "
-"topic branches by hiding any commit that is already in the main line of "
-"development. When given \"git show-branch --topics master topic1 topic2\", "
-"this will show the revisions given by \"git rev-list {caret}master topic1 "
-"topic2\""
+#, priority:100
+msgid "Shows only commits that are NOT on the first branch given. This helps track topic branches by hiding any commit that is already in the main line of development. When given \"git show-branch --topics master topic1 topic2\", this will show the revisions given by \"git rev-list {caret}master topic1 topic2\""
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:112
-#, no-wrap
+#, no-wrap, priority:100
msgid "--reflog[=<n>[,<base>]] [<ref>]"
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:118
-msgid ""
-"Shows <n> most recent ref-log entries for the given ref. If <base> is "
-"given, <n> entries going back from that entry. <base> can be specified as "
-"count or date. When no explicit <ref> parameter is given, it defaults to "
-"the current branch (or `HEAD` if it is detached)."
+#, priority:100
+msgid "Shows <n> most recent ref-log entries for the given ref. If <base> is given, <n> entries going back from that entry. <base> can be specified as count or date. When no explicit <ref> parameter is given, it defaults to the current branch (or `HEAD` if it is detached)."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:123
-msgid ""
-"Color the status sign (one of these: `*` `!` `+` `-`) of each commit "
-"corresponding to the branch it's in. The value must be always (the "
-"default), never, or auto."
+#, priority:100
+msgid "Color the status sign (one of these: `*` `!` `+` `-`) of each commit corresponding to the branch it's in. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:128
-msgid ""
-"Turn off colored output, even when the configuration file gives the default "
-"to color output. Same as `--color=never`."
+#, priority:100
+msgid "Turn off colored output, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:131
-msgid ""
-"Note that --more, --list, --independent and --merge-base options are "
-"mutually exclusive."
+#, priority:100
+msgid "Note that --more, --list, --independent and --merge-base options are mutually exclusive."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:139
-msgid ""
-"Given N <references>, the first N lines are the one-line description from "
-"their commit message. The branch head that is pointed at by $GIT_DIR/HEAD "
-"is prefixed with an asterisk `*` character while other heads are prefixed "
-"with a `!` character."
+#, priority:100
+msgid "Given N <references>, the first N lines are the one-line description from their commit message. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk `*` character while other heads are prefixed with a `!` character."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:146
-msgid ""
-"Following these N lines, one-line log for each commit is displayed, indented "
-"N places. If a commit is on the I-th branch, the I-th indentation character "
-"shows a `+` sign; otherwise it shows a space. Merge commits are denoted by "
-"a `-` sign. Each commit shows a short name that can be used as an extended "
-"SHA-1 to name that commit."
+#, priority:100
+msgid "Following these N lines, one-line log for each commit is displayed, indented N places. If a commit is on the I-th branch, the I-th indentation character shows a `+` sign; otherwise it shows a space. Merge commits are denoted by a `-` sign. Each commit shows a short name that can be used as an extended SHA-1 to name that commit."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:149
-msgid ""
-"The following example shows three branches, \"master\", \"fixes\" and "
-"\"mhf\":"
+#, priority:100
+msgid "The following example shows three branches, \"master\", \"fixes\" and \"mhf\":"
msgstr ""
#. type: delimited block -
#: en/git-show-branch.txt:155
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git show-branch master fixes mhf\n"
"* [master] Add 'git show-branch'.\n"
@@ -53983,7 +46231,7 @@ msgstr ""
#. type: delimited block -
#: en/git-show-branch.txt:167
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" + [mhf] Allow \"+remote:local\" refspec to cause --force when fetching.\n"
" + [mhf~1] Use git-octopus when pulling more than one heads.\n"
@@ -54000,24 +46248,19 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:174
-msgid ""
-"These three branches all forked from a common commit, [master], whose commit "
-"message is \"Add \\'git show-branch'\". The \"fixes\" branch adds one "
-"commit \"Introduce \"reset type\" flag to \"git reset\"\". The \"mhf\" "
-"branch adds many other commits. The current branch is \"master\"."
+#, priority:100
+msgid "These three branches all forked from a common commit, [master], whose commit message is \"Add \\'git show-branch'\". The \"fixes\" branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". The \"mhf\" branch adds many other commits. The current branch is \"master\"."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:182
-msgid ""
-"If you keep your primary branches immediately under `refs/heads`, and topic "
-"branches in subdirectories of it, having the following in the configuration "
-"file may help:"
+#, priority:100
+msgid "If you keep your primary branches immediately under `refs/heads`, and topic branches in subdirectories of it, having the following in the configuration file may help:"
msgstr ""
#. type: delimited block -
#: en/git-show-branch.txt:187
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[showbranch]\n"
"\tdefault = --topo-order\n"
@@ -54026,102 +46269,91 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:193
-msgid ""
-"With this, `git show-branch` without extra parameters would show only the "
-"primary branches. In addition, if you happen to be on your topic branch, it "
-"is shown as well."
+#, priority:100
+msgid "With this, `git show-branch` without extra parameters would show only the primary branches. In addition, if you happen to be on your topic branch, it is shown as well."
msgstr ""
#. type: delimited block -
#: en/git-show-branch.txt:196
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git show-branch --reflog=\"10,1 hour ago\" --list master\n"
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:201
-msgid ""
-"shows 10 reflog entries going back from the tip as of 1 hour ago. Without "
-"`--list`, the output also shows how these tips are topologically related "
-"with each other."
+#, priority:100
+msgid "shows 10 reflog entries going back from the tip as of 1 hour ago. Without `--list`, the output also shows how these tips are topologically related with each other."
msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-show-index(1)"
msgstr "git-show-index(1)"
#. type: Plain text
#: en/git-show-index.txt:7
+#, priority:100
msgid "git-show-index - Show packed archive index"
msgstr ""
#. type: Plain text
#: en/git-show-index.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git show-index'\n"
msgstr ""
#. type: Plain text
#: en/git-show-index.txt:22
-msgid ""
-"Read the `.idx` file for a Git packfile (created with "
-"linkgit:git-pack-objects[1] or linkgit:git-index-pack[1]) from the standard "
-"input, and dump its contents. The output consists of one object per line, "
-"with each line containing two or three space-separated columns:"
+#, priority:100
+msgid "Read the `.idx` file for a Git packfile (created with linkgit:git-pack-objects[1] or linkgit:git-index-pack[1]) from the standard input, and dump its contents. The output consists of one object per line, with each line containing two or three space-separated columns:"
msgstr ""
#. type: Plain text
#: en/git-show-index.txt:25
-msgid ""
-"the first column is the offset in bytes of the object within the "
-"corresponding packfile"
+#, priority:100
+msgid "the first column is the offset in bytes of the object within the corresponding packfile"
msgstr ""
#. type: Plain text
#: en/git-show-index.txt:27
+#, priority:100
msgid "the second column is the object id of the object"
msgstr ""
#. type: Plain text
#: en/git-show-index.txt:30
-msgid ""
-"if the index version is 2 or higher, the third column contains the CRC32 of "
-"the object data"
+#, priority:100
+msgid "if the index version is 2 or higher, the third column contains the CRC32 of the object data"
msgstr ""
#. type: Plain text
#: en/git-show-index.txt:34
-msgid ""
-"The objects are output in the order in which they are found in the index "
-"file, which should be (in a correctly constructed file) sorted by object id."
+#, priority:100
+msgid "The objects are output in the order in which they are found in the index file, which should be (in a correctly constructed file) sorted by object id."
msgstr ""
#. type: Plain text
#: en/git-show-index.txt:38
-msgid ""
-"Note that you can get more information on a packfile by calling "
-"linkgit:git-verify-pack[1]. However, as this command considers only the "
-"index file itself, it's both faster and more flexible."
+#, priority:100
+msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-show-ref(1)"
msgstr "git-show-ref(1)"
#. type: Plain text
#: en/git-show-ref.txt:7
+#, priority:100
msgid "git-show-ref - List references in a local repository"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:15
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git show-ref' [-q|--quiet] [--verify] [--head] [-d|--dereference]\n"
"\t [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
@@ -54131,160 +46363,145 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:23
-msgid ""
-"Displays references available in a local repository along with the "
-"associated commit IDs. Results can be filtered using a pattern and tags can "
-"be dereferenced into object IDs. Additionally, it can be used to test "
-"whether a particular ref exists."
+#, priority:100
+msgid "Displays references available in a local repository along with the associated commit IDs. Results can be filtered using a pattern and tags can be dereferenced into object IDs. Additionally, it can be used to test whether a particular ref exists."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:25
+#, priority:100
msgid "By default, shows the tags, heads, and remote refs."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:29
-msgid ""
-"The --exclude-existing form is a filter that does the inverse. It reads refs "
-"from stdin, one ref per line, and shows those that don't exist in the local "
-"repository."
+#, priority:100
+msgid "The --exclude-existing form is a filter that does the inverse. It reads refs from stdin, one ref per line, and shows those that don't exist in the local repository."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:32
-msgid ""
-"Use of this utility is encouraged in favor of directly accessing files under "
-"the `.git` directory."
+#, priority:100
+msgid "Use of this utility is encouraged in favor of directly accessing files under the `.git` directory."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--head"
msgstr "--head"
#. type: Plain text
#: en/git-show-ref.txt:39
-#, fuzzy
+#, fuzzy, priority:100
msgid "Show the HEAD reference, even if it would normally be filtered out."
msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
#. type: Plain text
#: en/git-show-ref.txt:46
-msgid ""
-"Limit to \"refs/heads\" and \"refs/tags\", respectively. These options are "
-"not mutually exclusive; when given both, references stored in \"refs/heads\" "
-"and \"refs/tags\" are displayed."
+#, priority:100
+msgid "Limit to \"refs/heads\" and \"refs/tags\", respectively. These options are not mutually exclusive; when given both, references stored in \"refs/heads\" and \"refs/tags\" are displayed."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--dereference"
msgstr "--dereference"
#. type: Plain text
#: en/git-show-ref.txt:52
-msgid ""
-"Dereference tags into object IDs as well. They will be shown with "
-"\"{caret}{}\" appended."
+#, priority:100
+msgid "Dereference tags into object IDs as well. They will be shown with \"{caret}{}\" appended."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:54
-#, no-wrap
+#, no-wrap, priority:100
msgid "--hash[=<n>]"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:58
-msgid ""
-"Only show the SHA-1 hash, not the reference name. When combined with "
-"--dereference the dereferenced tag will still be shown after the SHA-1."
+#, priority:100
+msgid "Only show the SHA-1 hash, not the reference name. When combined with --dereference the dereferenced tag will still be shown after the SHA-1."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:64
-msgid ""
-"Enable stricter reference checking by requiring an exact ref path. Aside "
-"from returning an error code of 1, it will also print an error message if "
-"`--quiet` was not specified."
+#, priority:100
+msgid "Enable stricter reference checking by requiring an exact ref path. Aside from returning an error code of 1, it will also print an error message if `--quiet` was not specified."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:69
-msgid ""
-"Abbreviate the object name. When using `--hash`, you do not have to say "
-"`--hash --abbrev`; `--hash=n` would do."
+#, priority:100
+msgid "Abbreviate the object name. When using `--hash`, you do not have to say `--hash --abbrev`; `--hash=n` would do."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:75
-msgid ""
-"Do not print any results to stdout. When combined with `--verify` this can "
-"be used to silently check if a reference exists."
+#, priority:100
+msgid "Do not print any results to stdout. When combined with `--verify` this can be used to silently check if a reference exists."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:76
-#, no-wrap
+#, no-wrap, priority:100
msgid "--exclude-existing[=<pattern>]"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:81
-msgid ""
-"Make 'git show-ref' act as a filter that reads refs from stdin of the form "
-"\"`^(?:<anything>\\s)?<refname>(?:\\^{})?$`\" and performs the following "
-"actions on each:"
+#, priority:100
+msgid "Make 'git show-ref' act as a filter that reads refs from stdin of the form \"`^(?:<anything>\\s)?<refname>(?:\\^{})?$`\" and performs the following actions on each:"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:82
+#, priority:100
msgid "strip \"{caret}{}\" at the end of line if any;"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:83
+#, priority:100
msgid "ignore if pattern is provided and does not head-match refname;"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:84
+#, priority:100
msgid "warn if refname is not a well-formed refname and skip;"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:85
+#, priority:100
msgid "ignore if refname is a ref that exists in the local repository;"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:86
+#, priority:100
msgid "otherwise output the line."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:95
-msgid ""
-"Show references matching one or more patterns. Patterns are matched from the "
-"end of the full name, and only complete parts are matched, e.g. 'master' "
-"matches 'refs/heads/master', 'refs/remotes/origin/master', "
-"'refs/tags/jedi/master' but not 'refs/heads/mymaster' or "
-"'refs/remotes/master/jedi'."
+#, priority:100
+msgid "Show references matching one or more patterns. Patterns are matched from the end of the full name, and only complete parts are matched, e.g. 'master' matches 'refs/heads/master', 'refs/remotes/origin/master', 'refs/tags/jedi/master' but not 'refs/heads/mymaster' or 'refs/remotes/master/jedi'."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:100
+#, priority:100
msgid "The output is in the format: '<SHA-1 ID>' '<space>' '<reference name>'."
msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:111
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git show-ref --head --dereference\n"
"832e76a9899f560a90ffd62ae2ce83bbeff58f54 HEAD\n"
@@ -54299,12 +46516,13 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:114
+#, priority:100
msgid "When using --hash (and not --dereference) the output format is: '<SHA-1 ID>'"
msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:121
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git show-ref --heads --hash\n"
"2e3ba0114a1f52b47df29743d6915d056be13278\n"
@@ -54315,58 +46533,55 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:129
-msgid ""
-"To show all references called \"master\", whether tags or heads or anything "
-"else, and regardless of how deep in the reference naming hierarchy they are, "
-"use:"
+#, priority:100
+msgid "To show all references called \"master\", whether tags or heads or anything else, and regardless of how deep in the reference naming hierarchy they are, use:"
msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:132
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit show-ref master\n"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:136
-msgid ""
-"This will show \"refs/heads/master\" but also "
-"\"refs/remote/other-repo/master\", if such references exists."
+#, priority:100
+msgid "This will show \"refs/heads/master\" but also \"refs/remote/other-repo/master\", if such references exists."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:138
+#, priority:100
msgid "When using the `--verify` flag, the command requires an exact path:"
msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:141
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit show-ref --verify refs/heads/master\n"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:144
+#, priority:100
msgid "will only match the exact branch called \"master\"."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:147
-msgid ""
-"If nothing matches, 'git show-ref' will return an error code of 1, and in "
-"the case of verification, it will show an error message."
+#, priority:100
+msgid "If nothing matches, 'git show-ref' will return an error code of 1, and in the case of verification, it will show an error message."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:150
-msgid ""
-"For scripting, you can ask it to be quiet with the \"--quiet\" flag, which "
-"allows you to do things like"
+#, priority:100
+msgid "For scripting, you can ask it to be quiet with the \"--quiet\" flag, which allows you to do things like"
msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:154
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tgit show-ref --quiet --verify -- \"refs/heads/$headname\" ||\n"
"\t\techo \"$headname is not a valid branch\"\n"
@@ -54374,431 +46589,391 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:159
-msgid ""
-"to check whether a particular branch exists or not (notice how we don't "
-"actually want to show any results, and we want to use the full refname for "
-"it in order to not trigger the problem with ambiguous partial matches)."
+#, priority:100
+msgid "to check whether a particular branch exists or not (notice how we don't actually want to show any results, and we want to use the full refname for it in order to not trigger the problem with ambiguous partial matches)."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:163
-msgid ""
-"To show only tags, or only proper branch heads, use \"--tags\" and/or "
-"\"--heads\" respectively (using both means that it shows tags and heads, but "
-"not other random references under the refs/ subdirectory)."
+#, priority:100
+msgid "To show only tags, or only proper branch heads, use \"--tags\" and/or \"--heads\" respectively (using both means that it shows tags and heads, but not other random references under the refs/ subdirectory)."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:166
-msgid ""
-"To do automatic tag object dereferencing, use the \"-d\" or "
-"\"--dereference\" flag, so you can do"
+#, priority:100
+msgid "To do automatic tag object dereferencing, use the \"-d\" or \"--dereference\" flag, so you can do"
msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:169
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit show-ref --tags --dereference\n"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:172
+#, priority:100
msgid "to get a listing of all tags together with what they dereference."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:176
+#, priority:100
msgid "`.git/refs/*`, `.git/packed-refs`"
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:183
#, ignore-same, priority:100
-msgid ""
-"linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], "
-"linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]"
-msgstr ""
-"linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-"
-"ref[1], linkgit:gitrepository-layout[5]"
+msgid "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]"
+msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]"
#. type: Title =
#: en/git-show.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
+#, priority:260
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
msgid "'git show' [<options>] [<object>...]\n"
msgstr "git show [<opciones>] <objeto>..."
#. type: Plain text
#: en/git-show.txt:17
+#, priority:260
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-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'."
+#, priority:260
+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
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-msgid ""
-"For trees, it shows the names (equivalent to 'git ls-tree' with "
-"--name-only)."
+#, priority:260
+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
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-msgid ""
-"The command takes options applicable to the 'git diff-tree' command to "
-"control how the changes the commit introduces are shown."
+#, priority:260
+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
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:260
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-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]."
+#, priority:260
+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: Labeled list
#: en/git-show.txt:60
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:63
+#, priority:260
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:64
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
+#, priority:260
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:70
+#, priority:260
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:71
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:75
-msgid ""
-"Shows the contents of the file `Documentation/README` as they were current "
-"in the 10th last commit of the branch `next`."
+#, priority:260
+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:76
-#, no-wrap
+#, no-wrap, priority:260
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:79
-msgid ""
-"Concatenates the contents of said Makefiles in the head of the branch "
-"`master`."
+#, priority:260
+msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-sh-setup(1)"
msgstr "git-sh-setup(1)"
#. type: Plain text
#: en/git-sh-setup.txt:7
+#, priority:100
msgid "git-sh-setup - Common Git shell script setup code"
msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:23
-msgid ""
-"The 'git sh-setup' scriptlet is designed to be sourced (using `.`) by other "
-"shell scripts to set up some variables pointing at the normal Git "
-"directories and a few helper shell functions."
+#, priority:100
+msgid "The 'git sh-setup' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up some variables pointing at the normal Git directories and a few helper shell functions."
msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:29
-msgid ""
-"Before sourcing it, your script should set up a few variables; `USAGE` (and "
-"`LONG_USAGE`, if any) is used to define message given by `usage()` shell "
-"function. `SUBDIRECTORY_OK` can be set if the script can run from a "
-"subdirectory of the working tree (some commands do not)."
+#, priority:100
+msgid "Before sourcing it, your script should set up a few variables; `USAGE` (and `LONG_USAGE`, if any) is used to define message given by `usage()` shell function. `SUBDIRECTORY_OK` can be set if the script can run from a subdirectory of the working tree (some commands do not)."
msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:32
-msgid ""
-"The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but "
-"does *not* export them to the environment."
+#, priority:100
+msgid "The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but does *not* export them to the environment."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:36
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "die"
msgstr "die"
#. type: Plain text
#: en/git-sh-setup.txt:39
+#, priority:100
msgid "exit after emitting the supplied error message to the standard error stream."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:40
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "usage"
msgstr "usage"
#. type: Plain text
#: en/git-sh-setup.txt:42
+#, priority:100
msgid "die with the usage message."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:43
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "set_reflog_action"
msgstr "set_reflog_action"
#. type: Plain text
#: en/git-sh-setup.txt:49
-msgid ""
-"Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of "
-"the program) unless it is already set. Whenever the script runs a `git` "
-"command that updates refs, a reflog entry is created using the value of this "
-"string to leave the record of what command updated the ref."
+#, priority:100
+msgid "Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of the program) unless it is already set. Whenever the script runs a `git` command that updates refs, a reflog entry is created using the value of this string to leave the record of what command updated the ref."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:50
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git_editor"
msgstr "git_editor"
#. type: Plain text
#: en/git-sh-setup.txt:54
-msgid ""
-"runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or EDITOR) "
-"on a given file, but error out if no editor is specified and the terminal is "
-"dumb."
+#, priority:100
+msgid "runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or EDITOR) on a given file, but error out if no editor is specified and the terminal is dumb."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:55
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "is_bare_repository"
msgstr "--is-bare-repository"
#. type: Plain text
#: en/git-sh-setup.txt:59
-msgid ""
-"outputs `true` or `false` to the standard output stream to indicate if the "
-"repository is a bare repository (i.e. without an associated working tree)."
+#, priority:100
+msgid "outputs `true` or `false` to the standard output stream to indicate if the repository is a bare repository (i.e. without an associated working tree)."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:60
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "cd_to_toplevel"
msgstr "cd_to_toplevel"
#. type: Plain text
#: en/git-sh-setup.txt:62
-#, fuzzy
+#, fuzzy, priority:100
msgid "runs chdir to the toplevel of the working tree."
msgstr "No se puede aplicar chdir a $cdup, el nivel m찼ximo del 찼rbol de trabajo"
#. type: Labeled list
#: en/git-sh-setup.txt:63
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "require_work_tree"
msgstr "require_work_tree"
#. type: Plain text
#: en/git-sh-setup.txt:66
-msgid ""
-"checks if the current directory is within the working tree of the "
-"repository, and otherwise dies."
+#, priority:100
+msgid "checks if the current directory is within the working tree of the repository, and otherwise dies."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:67
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "require_work_tree_exists"
msgstr "require_work_tree_exists"
#. type: Plain text
#: en/git-sh-setup.txt:72
-msgid ""
-"checks if the working tree associated with the repository exists, and "
-"otherwise dies. Often done before calling cd_to_toplevel, which is "
-"impossible to do if there is no working tree."
+#, priority:100
+msgid "checks if the working tree associated with the repository exists, and otherwise dies. Often done before calling cd_to_toplevel, which is impossible to do if there is no working tree."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:73
-#, no-wrap
+#, no-wrap, priority:100
msgid "require_clean_work_tree <action> [<hint>]"
msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:78
-msgid ""
-"checks that the working tree and index associated with the repository have "
-"no uncommitted changes to tracked files. Otherwise it emits an error "
-"message of the form `Cannot <action>: <reason>. <hint>`, and dies. Example:"
+#, priority:100
+msgid "checks that the working tree and index associated with the repository have no uncommitted changes to tracked files. Otherwise it emits an error message of the form `Cannot <action>: <reason>. <hint>`, and dies. Example:"
msgstr ""
#. type: delimited block -
#: en/git-sh-setup.txt:81
-#, no-wrap
+#, no-wrap, priority:100
msgid "require_clean_work_tree rebase \"Please commit or stash them.\"\n"
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "get_author_ident_from_commit"
msgstr "get_author_ident_from_commit"
#. type: Plain text
#: en/git-sh-setup.txt:86
-msgid ""
-"outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL "
-"and GIT_AUTHOR_DATE variables for a given commit."
+#, priority:100
+msgid "outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit."
msgstr ""
#. type: Labeled list
#: en/git-sh-setup.txt:87
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "create_virtual_base"
msgstr "create_virtual_base"
#. type: Plain text
#: en/git-sh-setup.txt:92
-msgid ""
-"modifies the first file so only lines in common with the second file "
-"remain. If there is insufficient common material, then the first file is "
-"left empty. The result is suitable as a virtual base input for a 3-way "
-"merge."
+#, priority:100
+msgid "modifies the first file so only lines in common with the second file remain. If there is insufficient common material, then the first file is left empty. The result is suitable as a virtual base input for a 3-way merge."
msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-stage(1)"
msgstr "git-stage(1)"
#. type: Plain text
#: en/git-stage.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-stage - Add file contents to the staging area"
msgstr "Agrega contenidos de un archivo al 찼rea de staging"
#. type: Plain text
#: en/git-stage.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git stage' args...\n"
msgstr ""
#. type: Plain text
#: en/git-stage.txt:20
-msgid ""
-"This is a synonym for linkgit:git-add[1]. Please refer to the documentation "
-"of that command."
+#, priority:100
+msgid "This is a synonym for linkgit:git-add[1]. Please refer to the documentation of that command."
msgstr ""
#. type: Title =
#: en/git-stash.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "git-stash(1)"
msgstr "git-stash(1)"
#. type: Plain text
#: en/git-stash.txt:7
-#, fuzzy
+#, fuzzy, priority:240
msgid "git-stash - Stash the changes in a dirty working directory away"
-msgstr ""
-"Poner en un stash los cambios en un directorio de trabajo sucio de todas "
-"maneras"
+msgstr "Poner en un stash los cambios en un directorio de trabajo sucio de todas maneras"
#. type: Plain text
-#: en/git-stash.txt:22
-#, no-wrap
+#: en/git-stash.txt:23
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
"'git stash' show [<options>] [<stash>]\n"
@@ -54807,6 +46982,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -54814,322 +46990,304 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
-msgid ""
-"Use `git stash` when you want to record the current state of the working "
-"directory and the index, but want to go back to a clean working directory. "
-"The command saves your local modifications away and reverts the working "
-"directory to match the `HEAD` commit."
+#: en/git-stash.txt:31
+#, priority:240
+msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
-msgid ""
-"The modifications stashed away by this command can be listed with `git stash "
-"list`, inspected with `git stash show`, and restored (potentially on top of "
-"a different commit) with `git stash apply`. Calling `git stash` without any "
-"arguments is equivalent to `git stash push`. A stash is by default listed "
-"as \"WIP on 'branchname' ...\", but you can give a more descriptive message "
-"on the command line when you create one."
+#: en/git-stash.txt:39
+#, ignore-ellipsis, priority:240
+msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
-msgid ""
-"The latest stash you created is stored in `refs/stash`; older stashes are "
-"found in the reflog of this reference and can be named using the usual "
-"reflog syntax (e.g. `stash@{0}` is the most recently created stash, "
-"`stash@{1}` is the one before it, `stash@{2.hours.ago}` is also "
-"possible). Stashes may also be referenced by specifying just the stash index "
-"(e.g. the integer `n` is equivalent to `stash@{n}`)."
+#: en/git-stash.txt:46
+#, priority:240
+msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
-#, no-wrap
-msgid ""
-"push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] "
-"[-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+#: en/git-stash.txt:50
+#, ignore-ellipsis, no-wrap, priority:240
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
-msgid ""
-"Save your local modifications to a new 'stash entry' and roll them back to "
-"HEAD (in the working tree and in the index). The <message> part is optional "
-"and gives the description along with the stashed state."
+#: en/git-stash.txt:56
+#, priority:240
+msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-msgid ""
-"For quickly making a snapshot, you can omit \"push\". In this mode, "
-"non-option arguments are not allowed to prevent a misspelled subcommand from "
-"making an unwanted stash entry. The two exceptions to this are `stash -p` "
-"which acts as alias for `stash push -p` and pathspecs, which are allowed "
-"after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-msgid ""
-"When pathspec is given to 'git stash push', the new stash entry records the "
-"modified states only for the files that match the pathspec. The index "
-"entries and working tree files are then rolled back to the state in HEAD "
-"only for these files, too, leaving files that do not match the pathspec "
-"intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-msgid ""
-"If the `--keep-index` option is used, all changes already added to the index "
-"are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-msgid ""
-"If the `--include-untracked` option is used, all untracked files are also "
-"stashed and then cleaned up with `git clean`, leaving the working directory "
-"in a very clean state. If the `--all` option is used instead then the "
-"ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
-msgid ""
-"With `--patch`, you can interactively select hunks from the diff between "
-"HEAD and the working tree to be stashed. The stash entry is constructed "
-"such that its index state is the same as the index state of your repository, "
-"and its worktree contains only the changes you selected interactively. The "
-"selected changes are then rolled back from your worktree. See the "
-"``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
-"the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-msgid ""
-"The `--patch` option implies `--keep-index`. You can use `--no-keep-index` "
-"to override this."
+#: en/git-stash.txt:62
+#, priority:240
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
-#, no-wrap
-msgid ""
-"save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] "
-"[-q|--quiet] [<message>]"
+#: en/git-stash.txt:63
+#, no-wrap, priority:240
+msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
-msgid ""
-"This option is deprecated in favour of 'git stash push'. It differs from "
-"\"stash push\" in that it cannot take pathspecs. Instead, all non-option "
-"arguments are concatenated to form the stash message."
+#: en/git-stash.txt:69
+#, priority:240
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
-#, no-wrap
+#: en/git-stash.txt:70
+#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
-msgid ""
-"List the stash entries that you currently have. Each 'stash entry' is "
-"listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is "
-"the one before, etc.), the name of the branch that was current when the "
-"entry was made, and a short description of the commit the entry was based "
-"on."
+#: en/git-stash.txt:77
+#, priority:240
+msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
-#, no-wrap
+#: en/git-stash.txt:81
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
"stash@{1}: On master: 9cc0589... Add git-stash\n"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
-msgid ""
-"The command takes options applicable to the 'git log' command to control "
-"what is shown and how. See linkgit:git-log[1]."
+#: en/git-stash.txt:85
+#, priority:240
+msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
-#, no-wrap
+#: en/git-stash.txt:86
+#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
-msgid ""
-"Show the changes recorded in the stash entry as a diff between the stashed "
-"contents and the commit back when the stash entry was first created. When no "
-"`<stash>` is given, it shows the latest one. By default, the command shows "
-"the diffstat, but it will accept any format known to 'git diff' (e.g., `git "
-"stash show -p stash@{1}` to view the second most recent entry in patch "
-"form). You can use stash.showStat and/or stash.showPatch config variables "
-"to change the default behavior."
+#: en/git-stash.txt:96
+#, priority:240
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
-#, fuzzy, no-wrap
+#: en/git-stash.txt:97
+#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:127
-msgid ""
-"Remove a single stashed state from the stash list and apply it on top of the "
-"current working tree state, i.e., do the inverse operation of `git stash "
-"push`. The working directory must match the index."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:131
-msgid ""
-"Applying the state can fail with conflicts; in this case, it is not removed "
-"from the stash list. You need to resolve the conflicts by hand and call `git "
-"stash drop` manually afterwards."
+#: en/git-stash.txt:103
+#, priority:240
+msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:136
-msgid ""
-"If the `--index` option is used, then tries to reinstate not only the "
-"working tree's changes, but also the index's ones. However, this can fail, "
-"when you have conflicts (which are stored in the index, where you therefore "
-"can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-msgid ""
-"When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must "
-"be a reference of the form `stash@{<revision>}`."
+#: en/git-stash.txt:107
+#, priority:240
+msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:140
-#, fuzzy, no-wrap
+#: en/git-stash.txt:108
+#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:145
-msgid ""
-"Like `pop`, but do not remove the state from the stash list. Unlike `pop`, "
-"`<stash>` may be any commit that looks like a commit created by `stash push` "
-"or `stash create`."
+#: en/git-stash.txt:113
+#, priority:240
+msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
-#, no-wrap
+#: en/git-stash.txt:114
+#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
-msgid ""
-"Creates and checks out a new branch named `<branchname>` starting from the "
-"commit at which the `<stash>` was originally created, applies the changes "
-"recorded in `<stash>` to the new working tree and index. If that succeeds, "
-"and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops "
-"the `<stash>`. When no `<stash>` is given, applies the latest one."
+#: en/git-stash.txt:121
+#, priority:240
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
-msgid ""
-"This is useful if the branch on which you ran `git stash push` has changed "
-"enough that `git stash apply` fails due to conflicts. Since the stash entry "
-"is applied on top of the commit that was HEAD at the time `git stash` was "
-"run, it restores the originally stashed state with no conflicts."
+#: en/git-stash.txt:127
+#, priority:240
+msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
-#, no-wrap
+#: en/git-stash.txt:128
+#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
-msgid ""
-"Remove all the stash entries. Note that those entries will then be subject "
-"to pruning, and may be impossible to recover (see 'Examples' below for a "
-"possible strategy)."
+#: en/git-stash.txt:132
+#, priority:240
+msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
-#, no-wrap
+#: en/git-stash.txt:133
+#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
-msgid ""
-"Remove a single stash entry from the list of stash entries. When no "
-"`<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise "
-"`<stash>` must be a valid stash log reference of the form "
-"`stash@{<revision>}`."
+#: en/git-stash.txt:136
+#, priority:240
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
-#, no-wrap
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
-msgid ""
-"Create a stash entry (which is a regular commit object) and return its "
-"object name, without storing it anywhere in the ref namespace. This is "
-"intended to be useful for scripts. It is probably not the command you want "
-"to use; see \"push\" above."
+#: en/git-stash.txt:144
+#, priority:240
+msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
-#, fuzzy, no-wrap
+#: en/git-stash.txt:145
+#, fuzzy, no-wrap, priority:240
msgid "store"
msgstr "puntaje"
#. type: Plain text
-#: en/git-stash.txt:187
-msgid ""
-"Store a given stash created via 'git stash create' (which is a dangling "
-"merge commit) in the stash ref, updating the stash reflog. This is intended "
-"to be useful for scripts. It is probably not the command you want to use; "
-"see \"push\" above."
+#: en/git-stash.txt:151
+#, priority:240
+msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
-msgid ""
-"A stash entry is represented as a commit whose tree records the state of the "
-"working directory, and its first parent is the commit at `HEAD` when the "
-"entry was created. The tree of the second parent records the state of the "
-"index when the entry is made, and it is made a child of the `HEAD` commit. "
-"The ancestry graph looks like this:"
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
-#, no-wrap
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
+#, priority:240
+msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:256
+#, no-wrap, priority:240
msgid ""
" .----W\n"
" / /\n"
@@ -55137,39 +47295,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
-msgid ""
-"where `H` is the `HEAD` commit, `I` is a commit that records the state of "
-"the index, and `W` is a commit that records the state of the working tree."
+#: en/git-stash.txt:260
+#, priority:240
+msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
-#, no-wrap
+#: en/git-stash.txt:265
+#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
-msgid ""
-"When you are in the middle of something, you learn that there are upstream "
-"changes that are possibly relevant to what you are doing. When your local "
-"changes do not conflict with the changes in the upstream, a simple `git "
-"pull` will let you move forward."
+#: en/git-stash.txt:271
+#, priority:240
+msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
-msgid ""
-"However, there are cases in which your local changes do conflict with the "
-"upstream changes, and `git pull` refuses to overwrite your changes. In such "
-"a case, you can stash your changes away, perform a pull, and then unstash, "
-"like this:"
+#: en/git-stash.txt:276
+#, priority:240
+msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
-#, no-wrap
+#: en/git-stash.txt:284
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
" ...\n"
@@ -55180,17 +47331,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
-msgid ""
-"When you are in the middle of something, your boss comes in and demands that "
-"you fix something immediately. Traditionally, you would make a commit to a "
-"temporary branch to store your changes away, and return to your original "
-"branch to make the emergency fix, like this:"
+#: en/git-stash.txt:292
+#, priority:240
+msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
-#, no-wrap
+#: en/git-stash.txt:303
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git switch -c my_wip\n"
@@ -55204,13 +47352,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
+#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
-#, no-wrap
+#: en/git-stash.txt:314
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git stash\n"
@@ -55221,22 +47370,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
-#, no-wrap
+#: en/git-stash.txt:316
+#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
-msgid ""
-"You can use `git stash push --keep-index` when you want to make two or more "
-"commits out of the changes in the work tree, and you want to test each "
-"change before committing:"
+#: en/git-stash.txt:321
+#, priority:240
+msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
-#, no-wrap
+#: en/git-stash.txt:332
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git add --patch foo # add just first part to the index\n"
@@ -55250,23 +47397,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
-#, no-wrap
+#: en/git-stash.txt:334
+#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
-msgid ""
-"If you mistakenly drop or clear stash entries, they cannot be recovered "
-"through the normal safety mechanisms. However, you can try the following "
-"incantation to get a list of stash entries that are still in your "
-"repository, but not reachable any more:"
+#: en/git-stash.txt:340
+#, priority:240
+msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
-#, no-wrap
+#: en/git-stash.txt:345
+#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
"grep commit | cut -d\\ -f3 |\n"
@@ -55274,174 +47418,140 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
-msgid ""
-"linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], "
-"linkgit:git-reset[1], linkgit:git-switch[1]"
-msgstr ""
-"linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], "
-"linkgit:git-reset[1], linkgit:git-switch[1]"
+msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
+msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
#. type: Title =
#: en/git-status.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "git-status(1)"
msgstr "git-status(1)"
#. type: Plain text
#: en/git-status.txt:7
+#, priority:280
msgid "git-status - Show the working tree status"
msgstr ""
#. type: Plain text
#: en/git-status.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
msgstr "git status [<opciones>] [--] <especificaci처n-de-ruta>..."
#. type: Plain text
#: en/git-status.txt:23
-msgid ""
-"Displays paths that have differences between the index file and the current "
-"HEAD commit, paths that have differences between the working tree and the "
-"index file, and paths in the working tree that are not tracked by Git (and "
-"are not ignored by linkgit:gitignore[5]). The first are what you _would_ "
-"commit by running `git commit`; the second and third are what you _could_ "
-"commit by running 'git add' before running `git commit`."
+#, priority:280
+msgid "Displays paths that have differences between the index file and the current HEAD commit, paths that have differences between the working tree and the index file, and paths in the working tree that are not tracked by Git (and are not ignored by linkgit:gitignore[5]). The first are what you _would_ commit by running `git commit`; the second and third are what you _could_ commit by running 'git add' before running `git commit`."
msgstr ""
#. type: Plain text
#: en/git-status.txt:30
+#, priority:280
msgid "Give the output in the short-format."
msgstr ""
#. type: Labeled list
#: en/git-status.txt:35
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--show-stash"
msgstr "--show-stash"
#. type: Plain text
#: en/git-status.txt:37
+#, priority:280
msgid "Show the number of entries currently stashed away."
msgstr ""
#. type: Labeled list
#: en/git-status.txt:38
-#, no-wrap
+#, no-wrap, priority:280
msgid "--porcelain[=<version>]"
msgstr ""
#. type: Plain text
#: en/git-status.txt:43
-msgid ""
-"Give the output in an easy-to-parse format for scripts. This is similar to "
-"the short output, but will remain stable across Git versions and regardless "
-"of user configuration. See below for details."
+#, priority:280
+msgid "Give the output in an easy-to-parse format for scripts. This is similar to the short output, but will remain stable across Git versions and regardless of user configuration. See below for details."
msgstr ""
#. type: Plain text
#: en/git-status.txt:46
-msgid ""
-"The version parameter is used to specify the format version. This is "
-"optional and defaults to the original version 'v1' format."
+#, priority:280
+msgid "The version parameter is used to specify the format version. This is optional and defaults to the original version 'v1' format."
msgstr ""
#. type: Plain text
#: en/git-status.txt:49
+#, priority:280
msgid "Give the output in the long-format. This is the default."
msgstr ""
#. type: Plain text
#: en/git-status.txt:57
-msgid ""
-"In addition to the names of files that have been changed, also show the "
-"textual changes that are staged to be committed (i.e., like the output of "
-"`git diff --cached`). If `-v` is specified twice, then also show the changes "
-"in the working tree that have not yet been staged (i.e., like the output of "
-"`git diff`)."
+#, priority:280
+msgid "In addition to the names of files that have been changed, also show the textual changes that are staged to be committed (i.e., like the output of `git diff --cached`). If `-v` is specified twice, then also show the changes in the working tree that have not yet been staged (i.e., like the output of `git diff`)."
msgstr ""
#. type: Plain text
#: en/git-status.txt:66
-msgid ""
-"The mode parameter is used to specify the handling of untracked files. It "
-"is optional: it defaults to 'all', and if specified, it must be stuck to the "
-"option (e.g. `-uno`, but not `-u no`)."
+#, priority:280
+msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
#: en/git-status.txt:70
-#, no-wrap
+#, no-wrap, priority:280
msgid "'no' - Show no untracked files.\n"
msgstr ""
#. type: Plain text
#: en/git-status.txt:71
-#, no-wrap
+#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories.\n"
msgstr ""
#. type: Plain text
#: en/git-status.txt:82
-msgid ""
-"When `-u` option is not used, untracked files and directories are shown "
-"(i.e. the same as specifying `normal`), to help you avoid forgetting to add "
-"newly created files. Because it takes extra work to find untracked files in "
-"the filesystem, this mode may take some time in a large working tree. "
-"Consider enabling untracked cache and split index if supported (see `git "
-"update-index --untracked-cache` and `git update-index --split-index`), "
-"Otherwise you can use `no` to have `git status` return more quickly without "
-"showing untracked files."
+#, priority:280
+msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
#: en/git-status.txt:101
-msgid ""
-"Ignore changes to submodules when looking for changes. <when> can be either "
-"\"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using "
-"\"none\" will consider the submodule modified when it either contains "
-"untracked or modified files or its HEAD differs from the commit recorded in "
-"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" "
-"is used submodules are not considered dirty when they only contain untracked "
-"content (but they are still scanned for modified content). Using \"dirty\" "
-"ignores all changes to the work tree of submodules, only changes to the "
-"commits stored in the superproject are shown (this was the behavior before "
-"1.7.0). Using \"all\" hides all changes to submodules (and suppresses the "
-"output of submodule summaries when the config option "
-"`status.submoduleSummary` is set)."
+#, priority:280
+msgid "Ignore changes to submodules when looking for changes. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
#: en/git-status.txt:102
-#, no-wrap
+#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
msgstr ""
#. type: Plain text
#: en/git-status.txt:104
+#, priority:280
msgid "Show ignored files as well."
msgstr ""
#. type: Plain text
#: en/git-status.txt:108
-msgid ""
-"The mode parameter is used to specify the handling of ignored files. It is "
-"optional: it defaults to 'traditional'."
+#, priority:280
+msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
msgstr ""
#. type: Plain text
#: en/git-status.txt:112
+#, priority:280
msgid "'traditional' - Shows ignored files and directories, unless"
msgstr ""
#. type: Plain text
#: en/git-status.txt:115
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"--untracked-files=all is specified, in which case\n"
"individual files in ignored directories are\n"
@@ -55450,126 +47560,109 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:116
-#, no-wrap
+#, no-wrap, priority:280
msgid "'no'\t - Show no ignored files.\n"
msgstr ""
#. type: Plain text
#: en/git-status.txt:117
-#, no-wrap
+#, no-wrap, priority:280
msgid "'matching' - Shows ignored files and directories matching an\n"
msgstr ""
#. type: Plain text
#: en/git-status.txt:118
-#, no-wrap
+#, no-wrap, priority:280
msgid "ignore pattern.\n"
msgstr ""
#. type: Plain text
#: en/git-status.txt:124
-msgid ""
-"When 'matching' mode is specified, paths that explicitly match an ignored "
-"pattern are shown. If a directory matches an ignore pattern, then it is "
-"shown, but not paths contained in the ignored directory. If a directory does "
-"not match an ignore pattern, but all contents are ignored, then the "
-"directory is not shown, but all contents are shown."
+#, priority:280
+msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
#: en/git-status.txt:129
-msgid ""
-"Terminate entries with NUL, instead of LF. This implies the "
-"`--porcelain=v1` output format if no other format is given."
+#, priority:280
+msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
#: en/git-status.txt:136
-msgid ""
-"Display untracked files in columns. See configuration variable column.status "
-"for option syntax.`--column` and `--no-column` without options are "
-"equivalent to 'always' and 'never' respectively."
+#, priority:280
+msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
#: en/git-status.txt:137
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
#: en/git-status.txt:138
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
#. type: Plain text
#: en/git-status.txt:141
-msgid ""
-"Display or do not display detailed ahead/behind counts for the branch "
-"relative to its upstream branch. Defaults to true."
+#, priority:280
+msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
msgstr ""
#. type: Labeled list
#: en/git-status.txt:142
-#, no-wrap
#, ignore-same, no-wrap, priority:280
msgid "--renames"
msgstr "--renames"
#. type: Plain text
#: en/git-status.txt:146
-msgid ""
-"Turn on/off rename detection regardless of user configuration. See also "
-"linkgit:git-diff[1] `--no-renames`."
+#, priority:280
+msgid "Turn on/off rename detection regardless of user configuration. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Plain text
#: en/git-status.txt:151
-msgid ""
-"Turn on rename detection, optionally setting the similarity threshold. See "
-"also linkgit:git-diff[1] `--find-renames`."
+#, priority:280
+msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Plain text
#: en/git-status.txt:154
+#, priority:280
msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
#: en/git-status.txt:162
-msgid ""
-"The output from this command is designed to be used as a commit template "
-"comment. The default, long format, is designed to be human readable, "
-"verbose and descriptive. Its contents and format are subject to change at "
-"any time."
+#, priority:280
+msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
#: en/git-status.txt:167
-msgid ""
-"The paths mentioned in the output, unlike many other Git commands, are made "
-"relative to the current directory if you are working in a subdirectory (this "
-"is on purpose, to help cutting and pasting). See the status.relativePaths "
-"config option below."
+#, priority:280
+msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
#: en/git-status.txt:169
-#, no-wrap
+#, no-wrap, priority:280
msgid "Short Format"
msgstr ""
#. type: Plain text
#: en/git-status.txt:173
+#, priority:280
msgid "In the short-format, the status of each path is shown as one of these forms"
msgstr ""
#. type: Plain text
#: en/git-status.txt:176
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"\tXY PATH\n"
"\tXY ORIG_PATH -> PATH\n"
@@ -55577,77 +47670,73 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:180
-msgid ""
-"where `ORIG_PATH` is where the renamed/copied contents came "
-"from. `ORIG_PATH` is only shown when the entry is renamed or copied. The "
-"`XY` is a two-letter status code."
+#, priority:280
+msgid "where `ORIG_PATH` is where the renamed/copied contents came from. `ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a two-letter status code."
msgstr ""
#. type: Plain text
#: en/git-status.txt:186
-msgid ""
-"The fields (including the `->`) are separated from each other by a single "
-"space. If a filename contains whitespace or other nonprintable characters, "
-"that field will be quoted in the manner of a C string literal: surrounded by "
-"ASCII double quote (34) characters, and with interior special characters "
-"backslash-escaped."
+#, priority:280
+msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
msgstr ""
#. type: Plain text
#: en/git-status.txt:192
-msgid ""
-"For paths with merge conflicts, `X` and `Y` show the modification states of "
-"each side of the merge. For paths that do not have merge conflicts, `X` "
-"shows the status of the index, and `Y` shows the status of the work tree. "
-"For untracked paths, `XY` are `??`. Other status codes can be interpreted "
-"as follows:"
+#, priority:280
+msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
#: en/git-status.txt:194
+#, priority:280
msgid "' ' = unmodified"
msgstr ""
#. type: Plain text
#: en/git-status.txt:195
+#, priority:280
msgid "'M' = modified"
msgstr ""
#. type: Plain text
#: en/git-status.txt:196
+#, priority:280
msgid "'A' = added"
msgstr ""
#. type: Plain text
#: en/git-status.txt:197
+#, priority:280
msgid "'D' = deleted"
msgstr ""
#. type: Plain text
#: en/git-status.txt:198
+#, priority:280
msgid "'R' = renamed"
msgstr ""
#. type: Plain text
#: en/git-status.txt:199
+#, priority:280
msgid "'C' = copied"
msgstr ""
#. type: Plain text
#: en/git-status.txt:200
+#, priority:280
msgid "'U' = updated but unmerged"
msgstr ""
#. type: Plain text
#: en/git-status.txt:203
-msgid ""
-"Ignored files are not listed, unless `--ignored` option is in effect, in "
-"which case `XY` are `!!`."
+#, priority:280
+msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: delimited block .
#: en/git-status.txt:230
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"X Y Meaning\n"
"-------------------------------------------------\n"
@@ -55678,7 +47767,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:239
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"Submodules have more state and instead report\n"
"\t\tM the submodule has a different HEAD than\n"
@@ -55691,109 +47780,91 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:242
-msgid ""
-"'m' and '?' are applied recursively. For example if a nested submodule in a "
-"submodule contains an untracked file, this is reported as '?' as well."
+#, priority:280
+msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well."
msgstr ""
#. type: Plain text
#: en/git-status.txt:244
+#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
msgstr ""
#. type: Plain text
#: en/git-status.txt:246
-#, no-wrap
+#, no-wrap, priority:280
msgid " ## branchname tracking info\n"
msgstr ""
#. type: Title ~
#: en/git-status.txt:248
-#, no-wrap
+#, no-wrap, priority:280
msgid "Porcelain Format Version 1"
msgstr ""
#. type: Plain text
#: en/git-status.txt:255
-msgid ""
-"Version 1 porcelain format is similar to the short format, but is guaranteed "
-"not to change in a backwards-incompatible way between Git versions or based "
-"on user configuration. This makes it ideal for parsing by scripts. The "
-"description of the short format above also describes the porcelain format, "
-"with a few exceptions:"
+#, priority:280
+msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
#: en/git-status.txt:258
-msgid ""
-"The user's color.status configuration is not respected; color will always be "
-"off."
+#, priority:280
+msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
#: en/git-status.txt:261
-msgid ""
-"The user's status.relativePaths configuration is not respected; paths shown "
-"will always be relative to the repository root."
+#, priority:280
+msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
#: en/git-status.txt:271
-msgid ""
-"There is also an alternate -z format recommended for machine parsing. In "
-"that format, the status field is the same, but some other things change. "
-"First, the '\\->' is omitted from rename entries and the field order is "
-"reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) "
-"follows each filename, replacing space as a field separator and the "
-"terminating newline (but a space still separates the status field from the "
-"first filename). Third, filenames containing special characters are not "
-"specially formatted; no quoting or backslash-escaping is performed."
+#, priority:280
+msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Plain text
#: en/git-status.txt:273
-msgid ""
-"Any submodule changes are reported as modified `M` instead of `m` or single "
-"`?`."
+#, priority:280
+msgid "Any submodule changes are reported as modified `M` instead of `m` or single `?`."
msgstr ""
#. type: Title ~
#: en/git-status.txt:275
-#, no-wrap
+#, no-wrap, priority:280
msgid "Porcelain Format Version 2"
msgstr ""
#. type: Plain text
#: en/git-status.txt:280
-msgid ""
-"Version 2 format adds more detailed information about the state of the "
-"worktree and changed items. Version 2 also defines an extensible set of "
-"easy to parse optional headers."
+#, priority:280
+msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
#: en/git-status.txt:284
-msgid ""
-"Header lines start with \"#\" and are added in response to specific command "
-"line arguments. Parsers should ignore headers they don't recognize."
+#, priority:280
+msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Title ^
#: en/git-status.txt:286
-#, no-wrap
+#, no-wrap, priority:280
msgid "Branch Headers"
msgstr ""
#. type: Plain text
#: en/git-status.txt:290
-msgid ""
-"If `--branch` is given, a series of header lines are printed with "
-"information about the current branch."
+#, priority:280
+msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: delimited block .
#: en/git-status.txt:300
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"Line Notes\n"
"------------------------------------------------------------\n"
@@ -55807,45 +47878,43 @@ msgstr ""
#. type: Title ^
#: en/git-status.txt:303
-#, no-wrap
+#, no-wrap, priority:280
msgid "Changed Tracked Entries"
msgstr ""
#. type: Plain text
#: en/git-status.txt:310
-msgid ""
-"Following the headers, a series of lines are printed for tracked entries. "
-"One of three different line formats may be used to describe an entry "
-"depending on the type of change. Tracked entries are printed in an "
-"undefined order; parsers should allow for a mixture of the 3 line types in "
-"any order."
+#, priority:280
+msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
#: en/git-status.txt:312
+#, priority:280
msgid "Ordinary changed entries have the following format:"
msgstr ""
#. type: Plain text
#: en/git-status.txt:314
-#, no-wrap
+#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
msgstr ""
#. type: Plain text
#: en/git-status.txt:316
+#, priority:280
msgid "Renamed or copied entries have the following format:"
msgstr ""
#. type: Plain text
#: en/git-status.txt:318
-#, no-wrap
+#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
#: en/git-status.txt:349
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
"--------------------------------------------------------\n"
@@ -55880,20 +47949,19 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:353
-msgid ""
-"Unmerged entries have the following format; the first character is a \"u\" "
-"to distinguish from ordinary changed entries."
+#, priority:280
+msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
#: en/git-status.txt:355
-#, no-wrap
+#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
msgstr ""
#. type: delimited block .
#: en/git-status.txt:372
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"Field Meaning\n"
"--------------------------------------------------------\n"
@@ -55914,126 +47982,103 @@ msgstr ""
#. type: Title ^
#: en/git-status.txt:375
-#, no-wrap
+#, no-wrap, priority:280
msgid "Other Items"
msgstr ""
#. type: Plain text
#: en/git-status.txt:380
-msgid ""
-"Following the tracked entries (and if requested), a series of lines will be "
-"printed for untracked and then ignored items found in the worktree."
+#, priority:280
+msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
#: en/git-status.txt:382
+#, priority:280
msgid "Untracked items have the following format:"
msgstr ""
#. type: Plain text
#: en/git-status.txt:384
-#, no-wrap
+#, no-wrap, priority:280
msgid " ? <path>\n"
msgstr ""
#. type: Plain text
#: en/git-status.txt:386
+#, priority:280
msgid "Ignored items have the following format:"
msgstr ""
#. type: Plain text
#: en/git-status.txt:388
-#, no-wrap
+#, no-wrap, priority:280
msgid " ! <path>\n"
msgstr ""
#. type: Title ^
#: en/git-status.txt:390
-#, no-wrap
+#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
msgstr ""
#. type: Plain text
#: en/git-status.txt:395
-msgid ""
-"When the `-z` option is given, pathnames are printed as is and without any "
-"quoting and lines are terminated with a NUL (ASCII 0x00) byte."
+#, priority:280
+msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
#: en/git-status.txt:399
-msgid ""
-"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
-"explained for the configuration variable `core.quotePath` (see "
-"linkgit:git-config[1])."
+#, priority:280
+msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-status.txt:408
-msgid ""
-"The command honors `color.status` (or `status.color` -- they mean the same "
-"thing and the latter is kept for backward compatibility) and "
-"`color.status.<slot>` configuration variables to colorize its output."
+#, priority:280
+msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
#: en/git-status.txt:412
-msgid ""
-"If the config variable `status.relativePaths` is set to false, then all "
-"paths shown are relative to the repository root, not to the current "
-"directory."
+#, priority:280
+msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
#: en/git-status.txt:423
-msgid ""
-"If `status.submoduleSummary` is set to a non zero number or true (identical "
-"to -1 or an unlimited number), the submodule summary will be enabled for the "
-"long format and a summary of commits for modified submodules will be shown "
-"(see --summary-limit option of linkgit:git-submodule[1]). Please note that "
-"the summary output from the status command will be suppressed for all "
-"submodules when `diff.ignoreSubmodules` is set to 'all' or only for those "
-"submodules where `submodule.<name>.ignore=all`. To also view the summary for "
-"ignored submodules you can either use the --ignore-submodules=dirty command "
-"line option or the 'git submodule summary' command, which shows a similar "
-"output but does not honor these settings."
+#, priority:280
+msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title -
#: en/git-status.txt:425
-#, no-wrap
+#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
msgstr ""
#. type: Plain text
#: en/git-status.txt:436
-msgid ""
-"By default, `git status` will automatically refresh the index, updating the "
-"cached stat information from the working tree and writing out the "
-"result. Writing out the updated index is an optimization that isn't strictly "
-"necessary (`status` computes the values for itself, but writing them out is "
-"just to save subsequent programs from repeating our computation). When "
-"`status` is run in the background, the lock held during the write may "
-"conflict with other simultaneous processes, causing them to fail. Scripts "
-"running `status` in the background should consider using `git "
-"--no-optional-locks status` (see linkgit:git[1] for details)."
+#, priority:280
+msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-stripspace(1)"
msgstr "git-stripspace(1)"
#. type: Plain text
#: en/git-stripspace.txt:7
+#, priority:100
msgid "git-stripspace - Remove unnecessary whitespace"
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git stripspace' [-s | --strip-comments]\n"
"'git stripspace' [-c | --comment-lines]\n"
@@ -56041,91 +48086,88 @@ msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:21
-msgid ""
-"Read text, such as commit messages, notes, tags and branch descriptions, "
-"from the standard input and clean it in the manner used by Git."
+#, priority:100
+msgid "Read text, such as commit messages, notes, tags and branch descriptions, from the standard input and clean it in the manner used by Git."
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:23
+#, priority:100
msgid "With no arguments, this will:"
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:25
+#, priority:100
msgid "remove trailing whitespace from all lines"
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:26
+#, priority:100
msgid "collapse multiple consecutive empty lines into one empty line"
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:27
+#, priority:100
msgid "remove empty lines from the beginning and end of the input"
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:28
+#, priority:100
msgid "add a missing '\\n' to the last line if necessary."
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:31
-msgid ""
-"In the case where the input consists entirely of whitespace characters, no "
-"output will be produced."
+#, priority:100
+msgid "In the case where the input consists entirely of whitespace characters, no output will be produced."
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
-"*NOTE*: This is intended for cleaning metadata, prefer the "
-"`--whitespace=fix`\n"
-"mode of linkgit:git-apply[1] for correcting whitespace of patches or files "
-"in\n"
+"*NOTE*: This is intended for cleaning metadata, prefer the `--whitespace=fix`\n"
+"mode of linkgit:git-apply[1] for correcting whitespace of patches or files in\n"
"the repository.\n"
msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--strip-comments"
msgstr "--strip-comments"
#. type: Plain text
#: en/git-stripspace.txt:41
-#, fuzzy
+#, fuzzy, priority:100
msgid "Skip and remove all lines starting with comment character (default '#')."
-msgstr ""
-"saltar y borrar todas las l챠neas que comienzan con un car찼cter de comentario"
+msgstr "saltar y borrar todas las l챠neas que comienzan con un car찼cter de comentario"
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--comment-lines"
msgstr "--comment-lines"
#. type: Plain text
#: en/git-stripspace.txt:47
-msgid ""
-"Prepend comment character and blank to each line. Lines will automatically "
-"be terminated with a newline. On empty lines, only the comment character "
-"will be prepended."
+#, priority:100
+msgid "Prepend comment character and blank to each line. Lines will automatically be terminated with a newline. On empty lines, only the comment character will be prepended."
msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:52
+#, priority:100
msgid "Given the following noisy input with '$' indicating the end of a line:"
msgstr ""
#. type: delimited block -
#: en/git-stripspace.txt:65
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"|A brief introduction $\n"
"| $\n"
@@ -56142,12 +48184,13 @@ msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:68
+#, priority:100
msgid "Use 'git stripspace' with no arguments to obtain:"
msgstr ""
#. type: delimited block -
#: en/git-stripspace.txt:79
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"|A brief introduction$\n"
"|$\n"
@@ -56162,12 +48205,13 @@ msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:82
+#, priority:100
msgid "Use 'git stripspace --strip-comments' to obtain:"
msgstr ""
#. type: delimited block -
#: en/git-stripspace.txt:90
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"|A brief introduction$\n"
"|$\n"
@@ -56179,19 +48223,19 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "git-submodule(1)"
msgstr "git-submodule(1)"
#. type: Plain text
#: en/git-submodule.txt:7
+#, priority:220
msgid "git-submodule - Initialize, update or inspect submodules"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:24
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git submodule' [--quiet] [--cached]\n"
"'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]\n"
@@ -56209,303 +48253,235 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:29
+#, priority:220
msgid "Inspects, updates and manages submodules."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:31
+#, priority:220
msgid "For more information about submodules, see linkgit:gitsubmodules[7]."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:36
-msgid ""
-"With no arguments, shows the status of existing submodules. Several "
-"subcommands are available to perform operations on the submodules."
+#, priority:220
+msgid "With no arguments, shows the status of existing submodules. Several subcommands are available to perform operations on the submodules."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:37
-#, no-wrap
-msgid ""
-"add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] "
-"[--depth <depth>] [--] <repository> [<path>]"
+#, no-wrap, priority:220
+msgid "add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:41
-msgid ""
-"Add the given repository as a submodule at the given path to the changeset "
-"to be committed next to the current project: the current project is termed "
-"the \"superproject\"."
+#, priority:220
+msgid "Add the given repository as a submodule at the given path to the changeset to be committed next to the current project: the current project is termed the \"superproject\"."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:50
-msgid ""
-"<repository> is the URL of the new submodule's origin repository. This may "
-"be either an absolute URL, or (if it begins with ./ or ../), the location "
-"relative to the superproject's default remote repository (Please note that "
-"to specify a repository 'foo.git' which is located right next to a "
-"superproject 'bar.git', you'll have to use `../foo.git` instead of "
-"`./foo.git` - as one might expect when following the rules for relative URLs "
-"- because the evaluation of relative URLs in Git is identical to that of "
-"relative directories)."
+#, priority:220
+msgid "<repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's default remote repository (Please note that to specify a repository 'foo.git' which is located right next to a superproject 'bar.git', you'll have to use `../foo.git` instead of `./foo.git` - as one might expect when following the rules for relative URLs - because the evaluation of relative URLs in Git is identical to that of relative directories)."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:57
-msgid ""
-"The default remote is the remote of the remote-tracking branch of the "
-"current branch. If no such remote-tracking branch exists or the HEAD is "
-"detached, \"origin\" is assumed to be the default remote. If the "
-"superproject doesn't have a default remote configured the superproject is "
-"its own authoritative upstream and the current working directory is used "
-"instead."
+#, priority:220
+msgid "The default remote is the remote of the remote-tracking branch of the current branch. If no such remote-tracking branch exists or the HEAD is detached, \"origin\" is assumed to be the default remote. If the superproject doesn't have a default remote configured the superproject is its own authoritative upstream and the current working directory is used instead."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:66
-msgid ""
-"The optional argument <path> is the relative location for the cloned "
-"submodule to exist in the superproject. If <path> is not given, the "
-"canonical part of the source repository is used (\"repo\" for "
-"\"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). If <path> "
-"exists and is already a valid Git repository, then it is staged for commit "
-"without cloning. The <path> is also used as the submodule's logical name in "
-"its configuration entries unless `--name` is used to specify a logical name."
+#, priority:220
+msgid "The optional argument <path> is the relative location for the cloned submodule to exist in the superproject. If <path> is not given, the canonical part of the source repository is used (\"repo\" for \"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). If <path> exists and is already a valid Git repository, then it is staged for commit without cloning. The <path> is also used as the submodule's logical name in its configuration entries unless `--name` is used to specify a logical name."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:74
-msgid ""
-"The given URL is recorded into `.gitmodules` for use by subsequent users "
-"cloning the superproject. If the URL is given relative to the superproject's "
-"repository, the presumption is the superproject and submodule repositories "
-"will be kept together in the same relative location, and only the "
-"superproject's URL needs to be provided. git-submodule will correctly "
-"locate the submodule using the relative URL in `.gitmodules`."
+#, priority:220
+msgid "The given URL is recorded into `.gitmodules` for use by subsequent users cloning the superproject. If the URL is given relative to the superproject's repository, the presumption is the superproject and submodule repositories will be kept together in the same relative location, and only the superproject's URL needs to be provided. git-submodule will correctly locate the submodule using the relative URL in `.gitmodules`."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:75
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid "status [--cached] [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:83
-msgid ""
-"Show the status of the submodules. This will print the SHA-1 of the "
-"currently checked out commit for each submodule, along with the submodule "
-"path and the output of 'git describe' for the SHA-1. Each SHA-1 will "
-"possibly be prefixed with `-` if the submodule is not initialized, `+` if "
-"the currently checked out submodule commit does not match the SHA-1 found in "
-"the index of the containing repository and `U` if the submodule has merge "
-"conflicts."
+#, priority:220
+msgid "Show the status of the submodules. This will print the SHA-1 of the currently checked out commit for each submodule, along with the submodule path and the output of 'git describe' for the SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is not initialized, `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository and `U` if the submodule has merge conflicts."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:86
-msgid ""
-"If `--cached` is specified, this command will instead print the SHA-1 "
-"recorded in the superproject for each submodule."
+#, priority:220
+msgid "If `--cached` is specified, this command will instead print the SHA-1 recorded in the superproject for each submodule."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:89
-msgid ""
-"If `--recursive` is specified, this command will recurse into nested "
-"submodules, and show their status as well."
+#, priority:220
+msgid "If `--recursive` is specified, this command will recurse into nested submodules, and show their status as well."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:94
-msgid ""
-"If you are only interested in changes of the currently initialized "
-"submodules with respect to the commit recorded in the index or the HEAD, "
-"linkgit:git-status[1] and linkgit:git-diff[1] will provide that information "
-"too (and can also report changes to a submodule's work tree)."
+#, priority:220
+msgid "If you are only interested in changes of the currently initialized submodules with respect to the commit recorded in the index or the HEAD, linkgit:git-status[1] and linkgit:git-diff[1] will provide that information too (and can also report changes to a submodule's work tree)."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:95
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid "init [--] [<path>...]"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:102
-msgid ""
-"Initialize the submodules recorded in the index (which were added and "
-"committed elsewhere) by setting `submodule.$name.url` in .git/config. It "
-"uses the same setting from `.gitmodules` as a template. If the URL is "
-"relative, it will be resolved using the default remote. If there is no "
-"default remote, the current repository will be assumed to be upstream."
+#, priority:220
+msgid "Initialize the submodules recorded in the index (which were added and committed elsewhere) by setting `submodule.$name.url` in .git/config. It uses the same setting from `.gitmodules` as a template. If the URL is relative, it will be resolved using the default remote. If there is no default remote, the current repository will be assumed to be upstream."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:107
-msgid ""
-"Optional <path> arguments limit which submodules will be initialized. If no "
-"path is specified and submodule.active has been configured, submodules "
-"configured to be active will be initialized, otherwise all submodules are "
-"initialized."
+#, priority:220
+msgid "Optional <path> arguments limit which submodules will be initialized. If no path is specified and submodule.active has been configured, submodules configured to be active will be initialized, otherwise all submodules are initialized."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:115
-msgid ""
-"When present, it will also copy the value of `submodule.$name.update`. This "
-"command does not alter existing information in .git/config. You can then "
-"customize the submodule clone URLs in .git/config for your local setup and "
-"proceed to `git submodule update`; you can also just use `git submodule "
-"update --init` without the explicit 'init' step if you do not intend to "
-"customize any submodule locations."
+#, priority:220
+msgid "When present, it will also copy the value of `submodule.$name.update`. This command does not alter existing information in .git/config. You can then customize the submodule clone URLs in .git/config for your local setup and proceed to `git submodule update`; you can also just use `git submodule update --init` without the explicit 'init' step if you do not intend to customize any submodule locations."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:117
+#, priority:220
msgid "See the add subcommand for the definition of default remote."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:118
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid "deinit [-f|--force] (--all|[--] <path>...)"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:125
-msgid ""
-"Unregister the given submodules, i.e. remove the whole `submodule.$name` "
-"section from .git/config together with their work tree. Further calls to "
-"`git submodule update`, `git submodule foreach` and `git submodule sync` "
-"will skip any unregistered submodules until they are initialized again, so "
-"use this command if you don't want to have a local checkout of the submodule "
-"in your working tree anymore."
+#, priority:220
+msgid "Unregister the given submodules, i.e. remove the whole `submodule.$name` section from .git/config together with their work tree. Further calls to `git submodule update`, `git submodule foreach` and `git submodule sync` will skip any unregistered submodules until they are initialized again, so use this command if you don't want to have a local checkout of the submodule in your working tree anymore."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:128
-msgid ""
-"When the command is run without pathspec, it errors out, instead of "
-"deinit-ing everything, to prevent mistakes."
+#, priority:220
+msgid "When the command is run without pathspec, it errors out, instead of deinit-ing everything, to prevent mistakes."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:131
-msgid ""
-"If `--force` is specified, the submodule's working tree will be removed even "
-"if it contains local modifications."
+#, priority:220
+msgid "If `--force` is specified, the submodule's working tree will be removed even if it contains local modifications."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:135
-msgid ""
-"If you really want to remove a submodule from the repository and commit that "
-"use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal "
-"options."
+#, priority:220
+msgid "If you really want to remove a submodule from the repository and commit that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal options."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
-#, no-wrap
-msgid ""
-"update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] "
-"[-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] "
-"[--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+#, ignore-ellipsis, no-wrap, priority:220
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:148
-msgid ""
-"Update the registered submodules to match what the superproject expects by "
-"cloning missing submodules, fetching missing commits in submodules and "
-"updating the working tree of the submodules. The \"updating\" can be done in "
-"several ways depending on command line options and the value of "
-"`submodule.<name>.update` configuration variable. The command line option "
-"takes precedence over the configuration variable. If neither is given, a "
-"'checkout' is performed. The 'update' procedures supported both from the "
-"command line as well as through the `submodule.<name>.update` configuration "
-"are:"
+#, priority:220
+msgid "Update the registered submodules to match what the superproject expects by cloning missing submodules, fetching missing commits in submodules and updating the working tree of the submodules. The \"updating\" can be done in several ways depending on command line options and the value of `submodule.<name>.update` configuration variable. The command line option takes precedence over the configuration variable. If neither is given, a 'checkout' is performed. The 'update' procedures supported both from the command line as well as through the `submodule.<name>.update` configuration are:"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:149
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "checkout"
msgstr "--checkout"
#. type: Plain text
#: en/git-submodule.txt:150
+#, priority:220
msgid "the commit recorded in the superproject will be"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
+#, no-wrap, priority:220
msgid "checked out in the submodule on a detached HEAD.\n"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:156
-msgid ""
-"If `--force` is specified, the submodule will be checked out (using `git "
-"checkout --force`), even if the commit specified in the index of the "
-"containing repository already matches the commit checked out in the "
-"submodule."
+#, priority:220
+msgid "If `--force` is specified, the submodule will be checked out (using `git checkout --force`), even if the commit specified in the index of the containing repository already matches the commit checked out in the submodule."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:157
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "rebase"
msgstr "--rebase"
#. type: Plain text
#: en/git-submodule.txt:158
+#, priority:220
msgid "the current branch of the submodule will be rebased"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
+#, no-wrap, priority:220
msgid "onto the commit recorded in the superproject.\n"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:161
+#, priority:220
msgid "the commit recorded in the superproject will be merged"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
+#, no-wrap, priority:220
msgid "into the current branch in the submodule.\n"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:165
-msgid ""
-"The following 'update' procedures are only available via the "
-"`submodule.<name>.update` configuration variable:"
+#, priority:220
+msgid "The following 'update' procedures are only available via the `submodule.<name>.update` configuration variable:"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:166
-#, no-wrap
+#, no-wrap, priority:220
msgid "custom command"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:167
+#, priority:220
msgid "arbitrary shell command that takes a single"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"argument (the sha1 of the commit recorded in the\n"
"superproject) is executed. When `submodule.<name>.update`\n"
@@ -56515,435 +48491,319 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:173
+#, priority:220
msgid "the submodule is not updated."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:177
-msgid ""
-"If the submodule is not yet initialized, and you just want to use the "
-"setting as stored in `.gitmodules`, you can automatically initialize the "
-"submodule with the `--init` option."
+#, priority:220
+msgid "If the submodule is not yet initialized, and you just want to use the setting as stored in `.gitmodules`, you can automatically initialize the submodule with the `--init` option."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:180
-msgid ""
-"If `--recursive` is specified, this command will recurse into the registered "
-"submodules, and update any nested submodules within."
+#, priority:220
+msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:181
-#, no-wrap
+#, no-wrap, priority:220
msgid "set-branch (-b|--branch) <branch> [--] <path>"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:182
-#, no-wrap
+#, no-wrap, priority:220
msgid "set-branch (-d|--default) [--] <path>"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:187
-msgid ""
-"Sets the default remote tracking branch for the submodule. The `--branch` "
-"option allows the remote branch to be specified. The `--default` option "
-"removes the submodule.<name>.branch configuration key, which causes the "
-"tracking branch to default to 'master'."
+#, priority:220
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:188
-#, no-wrap
+#, no-wrap, priority:220
msgid "set-url [--] <path> <newurl>"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:192
-msgid ""
-"Sets the URL of the specified submodule to <newurl>. Then, it will "
-"automatically synchronize the submodule's new remote URL configuration."
+#, priority:220
+msgid "Sets the URL of the specified submodule to <newurl>. Then, it will automatically synchronize the submodule's new remote URL configuration."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:193
-#, no-wrap
-msgid ""
-"summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] "
-"[<path>...]"
+#, ignore-ellipsis, no-wrap, priority:220
+msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:202
-msgid ""
-"Show commit summary between the given commit (defaults to HEAD) and working "
-"tree/index. For a submodule in question, a series of commits in the "
-"submodule between the given super project commit and the index or working "
-"tree (switched by `--cached`) are shown. If the option `--files` is given, "
-"show the series of commits in the submodule between the index of the super "
-"project and the working tree of the submodule (this option doesn't allow to "
-"use the `--cached` option or to provide an explicit commit)."
+#, priority:220
+msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:205
-msgid ""
-"Using the `--submodule=log` option with linkgit:git-diff[1] will provide "
-"that information too."
+#, priority:220
+msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:206
-#, no-wrap
+#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:227
-msgid ""
-"Evaluates an arbitrary shell command in each checked out submodule. The "
-"command has access to the variables $name, $sm_path, $displaypath, $sha1 and "
-"$toplevel: $name is the name of the relevant submodule section in "
-"`.gitmodules`, $sm_path is the path of the submodule as recorded in the "
-"immediate superproject, $displaypath contains the relative path from the "
-"current working directory to the submodules root directory, $sha1 is the "
-"commit as recorded in the immediate superproject, and $toplevel is the "
-"absolute path to the top-level of the immediate superproject. Note that to "
-"avoid conflicts with '$PATH' on Windows, the '$path' variable is now a "
-"deprecated synonym of '$sm_path' variable. Any submodules defined in the "
-"superproject but not checked out are ignored by this command. Unless given "
-"`--quiet`, foreach prints the name of each submodule before evaluating the "
-"command. If `--recursive` is given, submodules are traversed recursively "
-"(i.e. the given shell command is evaluated in nested submodules as well). "
-"A non-zero return from the command in any submodule causes the processing to "
-"terminate. This can be overridden by adding '|| :' to the end of the "
-"command."
+#, priority:220
+msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:230
-msgid ""
-"As an example, the command below will show the path and currently checked "
-"out commit for each submodule:"
+#, priority:220
+msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
-#, no-wrap
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+#, no-wrap, priority:220
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:235
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:242
-msgid ""
-"Synchronizes submodules' remote URL configuration setting to the value "
-"specified in `.gitmodules`. It will only affect those submodules which "
-"already have a URL entry in .git/config (that is the case when they are "
-"initialized or freshly added). This is useful when submodule URLs change "
-"upstream and you need to update your local repositories accordingly."
+#, priority:220
+msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:245
-msgid ""
-"`git submodule sync` synchronizes all submodules while `git submodule sync "
-"-- A` synchronizes submodule \"A\" only."
+#, priority:220
+msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:248
-msgid ""
-"If `--recursive` is specified, this command will recurse into the registered "
-"submodules, and sync any nested submodules within."
+#, priority:220
+msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:249
-#, no-wrap
+#, no-wrap, priority:220
msgid "absorbgitdirs"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:256
-msgid ""
-"If a git directory of a submodule is inside the submodule, move the git "
-"directory of the submodule into its superproject's `$GIT_DIR/modules` path "
-"and then connect the git directory and its working directory by setting the "
-"`core.worktree` and adding a .git file pointing to the git directory "
-"embedded in the superprojects git directory."
+#, priority:220
+msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superproject's `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:260
-msgid ""
-"A repository that was cloned independently and later added as a submodule or "
-"old setups have the submodules git directory inside the submodule instead of "
-"embedded into the superprojects git directory."
+#, priority:220
+msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:262
+#, priority:220
msgid "This command is recursive by default."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:268
+#, priority:220
msgid "Only print error messages."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:275
-msgid ""
-"This option is only valid for add and update commands. Progress status is "
-"reported on the standard error stream by default when it is attached to a "
-"terminal, unless -q is specified. This flag forces progress status even if "
-"the standard error stream is not directed to a terminal."
+#, priority:220
+msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:279
-msgid ""
-"This option is only valid for the deinit command. Unregister all submodules "
-"in the working tree."
+#, priority:220
+msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:280
-#, no-wrap
+#, no-wrap, priority:220
msgid "-b <branch>"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:288
-msgid ""
-"Branch of repository to add as submodule. The name of the branch is "
-"recorded as `submodule.<name>.branch` in `.gitmodules` for `update "
-"--remote`. A special value of `.` is used to indicate that the name of the "
-"branch in the submodule should be the same name as the current branch in the "
-"current repository. If the option is not specified, it defaults to "
-"'master'."
+#, priority:220
+msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:301
-msgid ""
-"This option is only valid for add, deinit and update commands. When running "
-"add, allow adding an otherwise ignored submodule path. When running deinit "
-"the submodule working trees will be removed even if they contain local "
-"changes. When running update (only effective with the checkout procedure), "
-"throw away local changes in submodules when switching to a different commit; "
-"and always run a checkout operation in the submodule, even if the commit "
-"listed in the index of the containing repository matches the commit checked "
-"out in the submodule."
+#, priority:220
+msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:306
-msgid ""
-"This option is only valid for status and summary commands. These commands "
-"typically use the commit found in the submodule HEAD, but with this option, "
-"the commit stored in the index is used instead."
+#, priority:220
+msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:307
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--files"
msgstr "--files"
#. type: Plain text
#: en/git-submodule.txt:311
-msgid ""
-"This option is only valid for the summary command. This command compares the "
-"commit in the index with that in the submodule HEAD when this option is "
-"used."
+#, priority:220
+msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:313
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
#: en/git-submodule.txt:319
-msgid ""
-"This option is only valid for the summary command. Limit the summary size "
-"(number of commits shown in total). Giving 0 will disable the summary; a "
-"negative number means unlimited (the default). This limit only applies to "
-"modified submodules. The size is always limited to 1 for "
-"added/deleted/typechanged submodules."
+#, priority:220
+msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:320
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--remote"
msgstr "--remote"
#. type: Plain text
#: en/git-submodule.txt:329
-msgid ""
-"This option is only valid for the update command. Instead of using the "
-"superproject's recorded SHA-1 to update the submodule, use the status of the "
-"submodule's remote-tracking branch. The remote used is branch's remote "
-"(`branch.<name>.remote`), defaulting to `origin`. The remote branch used "
-"defaults to `master`, but the branch name may be overridden by setting the "
-"`submodule.<name>.branch` option in either `.gitmodules` or `.git/config` "
-"(with `.git/config` taking precedence)."
+#, priority:220
+msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:335
-msgid ""
-"This works for any of the supported update procedures (`--checkout`, "
-"`--rebase`, etc.). The only change is the source of the target SHA-1. For "
-"example, `submodule update --remote --merge` will merge upstream submodule "
-"changes into the submodules, while `submodule update --merge` will merge "
-"superproject gitlink changes into the submodules."
+#, priority:220
+msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:340
-msgid ""
-"In order to ensure a current tracking branch state, `update --remote` "
-"fetches the submodule's remote repository before calculating the SHA-1. If "
-"you don't want to fetch, you should use `submodule update --remote "
-"--no-fetch`."
+#, priority:220
+msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:350
-msgid ""
-"Use this option to integrate changes from the upstream subproject with your "
-"submodule's current HEAD. Alternatively, you can run `git pull` from the "
-"submodule, which is equivalent except for the remote branch name: `update "
-"--remote` uses the default upstream repository and "
-"`submodule.<name>.branch`, while `git pull` uses the submodule's "
-"`branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to "
-"distribute the default upstream branch with the superproject and "
-"`branch.<name>.merge` if you want a more native feel while working in the "
-"submodule itself."
+#, priority:220
+msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:352
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
#: en/git-submodule.txt:355
-msgid ""
-"This option is only valid for the update command. Don't fetch new objects "
-"from the remote site."
+#, priority:220
+msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:356
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--checkout"
msgstr "--checkout"
#. type: Plain text
#: en/git-submodule.txt:364
-msgid ""
-"This option is only valid for the update command. Checkout the commit "
-"recorded in the superproject on a detached HEAD in the submodule. This is "
-"the default behavior, the main use of this option is to override "
-"`submodule.$name.update` when set to a value other than `checkout`. If the "
-"key `submodule.$name.update` is either not explicitly set or set to "
-"`checkout`, this option is implicit."
+#, priority:220
+msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:374
-msgid ""
-"This option is only valid for the update command. Merge the commit recorded "
-"in the superproject into the current branch of the submodule. If this option "
-"is given, the submodule's HEAD will not be detached. If a merge failure "
-"prevents this process, you will have to resolve the resulting conflicts "
-"within the submodule with the usual conflict resolution tools. If the key "
-"`submodule.$name.update` is set to `merge`, this option is implicit."
+#, priority:220
+msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:375
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
#: en/git-submodule.txt:383
-msgid ""
-"This option is only valid for the update command. Rebase the current branch "
-"onto the commit recorded in the superproject. If this option is given, the "
-"submodule's HEAD will not be detached. If a merge failure prevents this "
-"process, you will have to resolve these failures with "
-"linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to "
-"`rebase`, this option is implicit."
+#, priority:220
+msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:384
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--init"
msgstr "--init"
#. type: Plain text
#: en/git-submodule.txt:388
-msgid ""
-"This option is only valid for the update command. Initialize all submodules "
-"for which \"git submodule init\" has not been called so far before updating."
+#, priority:220
+msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:389
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--name"
msgstr "--name"
#. type: Plain text
#: en/git-submodule.txt:393
-msgid ""
-"This option is only valid for the add command. It sets the submodule's name "
-"to the given string instead of defaulting to its path. The name must be "
-"valid as a directory name and may not end with a '/'."
+#, priority:220
+msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:394
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "--reference <repository>"
msgstr "repositorio de referencia"
#. type: Plain text
#: en/git-submodule.txt:398 en/git-submodule.txt:407
-msgid ""
-"This option is only valid for add and update commands. These commands "
-"sometimes need to clone a remote repository. In this case, this option will "
-"be passed to the linkgit:git-clone[1] command."
+#, priority:220
+msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:402
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"*NOTE*: Do *not* use this option unless you have read the note\n"
"for linkgit:git-clone[1]'s `--reference`, `--shared`, and `--dissociate`\n"
@@ -56952,1315 +48812,1107 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:409
-#, no-wrap
+#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:415
-msgid ""
-"This option is only valid for foreach, update, status and sync commands. "
-"Traverse submodules recursively. The operation is performed not only in the "
-"submodules of the current repo, but also in any nested submodules inside "
-"those submodules (and so on)."
+#, priority:220
+msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:416
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--depth"
msgstr "--depth"
#. type: Plain text
#: en/git-submodule.txt:420
-msgid ""
-"This option is valid for add and update commands. Create a 'shallow' clone "
-"with a history truncated to the specified number of revisions. See "
-"linkgit:git-clone[1]"
+#, priority:220
+msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:421
-#, no-wrap
#, ignore-same, no-wrap, priority:220
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
#. type: Plain text
#: en/git-submodule.txt:426
-msgid ""
-"This option is only valid for the update command. The initial clone of a "
-"submodule will use the recommended `submodule.<name>.shallow` as provided by "
-"the `.gitmodules` file by default. To ignore the suggestions use "
-"`--no-recommend-shallow`."
+#, priority:220
+msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:432
-msgid ""
-"This option is only valid for the update command. Clone new submodules in "
-"parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
+#, priority:220
+msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
-msgid ""
-"Paths to submodule(s). When specified this will restrict the command to only "
-"operate on the submodules found at the specified paths. (This argument is "
-"required with add)."
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
-msgid ""
-"When initializing submodules, a `.gitmodules` file in the top-level "
-"directory of the containing repository is used to find the url of each "
-"submodule. This file should be formatted in the same way as "
-"`$GIT_DIR/config`. The key to each submodule url is "
-"\"submodule.$name.url\". See linkgit:gitmodules[5] for details."
+#: en/git-submodule.txt:441
+#, priority:220
+msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:449
+#, priority:220
+msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
#. type: Title =
#: en/git-svn.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-svn(1)"
msgstr "git-svn(1)"
#. type: Plain text
#: en/git-svn.txt:7
-#, fuzzy
+#, fuzzy, priority:100
msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
msgstr "Operaci처n bidireccional entre un repositorio Subversion y Git"
#. type: Plain text
#: en/git-svn.txt:12
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git svn' <command> [<options>] [<arguments>]\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:18
-msgid ""
-"'git svn' is a simple conduit for changesets between Subversion and Git. It "
-"provides a bidirectional flow of changes between a Subversion and a Git "
-"repository."
+#, priority:100
+msgid "'git svn' is a simple conduit for changesets between Subversion and Git. It provides a bidirectional flow of changes between a Subversion and a Git repository."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:23
-msgid ""
-"'git svn' can track a standard Subversion repository, following the common "
-"\"trunk/branches/tags\" layout, with the --stdlayout option. It can also "
-"follow branches and tags in any layout with the -T/-t/-b options (see "
-"options to 'init' below, and also the 'clone' command)."
+#, priority:100
+msgid "'git svn' can track a standard Subversion repository, following the common \"trunk/branches/tags\" layout, with the --stdlayout option. It can also follow branches and tags in any layout with the -T/-t/-b options (see options to 'init' below, and also the 'clone' command)."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:27
-msgid ""
-"Once tracking a Subversion repository (with any of the above methods), the "
-"Git repository can be updated from Subversion by the 'fetch' command and "
-"Subversion updated from Git by the 'dcommit' command."
+#, priority:100
+msgid "Once tracking a Subversion repository (with any of the above methods), the Git repository can be updated from Subversion by the 'fetch' command and Subversion updated from Git by the 'dcommit' command."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'init'"
msgstr "'init'"
#. type: Plain text
#: en/git-svn.txt:39
-msgid ""
-"Initializes an empty Git repository with additional metadata directories for "
-"'git svn'. The Subversion URL may be specified as a command-line argument, "
-"or as full URL arguments to -T/-t/-b. Optionally, the target directory to "
-"operate on can be specified as a second argument. Normally this command "
-"initializes the current directory."
+#, priority:100
+msgid "Initializes an empty Git repository with additional metadata directories for 'git svn'. The Subversion URL may be specified as a command-line argument, or as full URL arguments to -T/-t/-b. Optionally, the target directory to operate on can be specified as a second argument. Normally this command initializes the current directory."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:40
-#, no-wrap
+#, no-wrap, priority:100
msgid "-T<trunk_subdir>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:41
-#, no-wrap
+#, no-wrap, priority:100
msgid "--trunk=<trunk_subdir>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:42
-#, no-wrap
+#, no-wrap, priority:100
msgid "-t<tags_subdir>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:43
-#, no-wrap
+#, no-wrap, priority:100
msgid "--tags=<tags_subdir>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "-b<branches_subdir>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "--branches=<branches_subdir>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stdlayout"
msgstr "--stdlayout"
#. type: Plain text
#: en/git-svn.txt:58
-msgid ""
-"These are optional command-line options for init. Each of these flags can "
-"point to a relative repository path (--tags=project/tags) or a full url "
-"(--tags=https://foo.org/project/tags). You can specify more than one --tags "
-"and/or --branches options, in case your Subversion repository places tags or "
-"branches under multiple paths. The option --stdlayout is a shorthand way of "
-"setting trunk,tags,branches as the relative paths, which is the Subversion "
-"default. If any of the other options are given as well, they take "
-"precedence."
+#, priority:100
+msgid "These are optional command-line options for init. Each of these flags can point to a relative repository path (--tags=project/tags) or a full url (--tags=https://foo.org/project/tags). You can specify more than one --tags and/or --branches options, in case your Subversion repository places tags or branches under multiple paths. The option --stdlayout is a shorthand way of setting trunk,tags,branches as the relative paths, which is the Subversion default. If any of the other options are given as well, they take precedence."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-metadata"
msgstr "--no-metadata"
#. type: Plain text
#: en/git-svn.txt:62
-msgid ""
-"Set the 'noMetadata' option in the [svn-remote] config. This option is not "
-"recommended, please read the 'svn.noMetadata' section of this manpage before "
-"using this option."
+#, priority:100
+msgid "Set the 'noMetadata' option in the [svn-remote] config. This option is not recommended, please read the 'svn.noMetadata' section of this manpage before using this option."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--use-svm-props"
msgstr "--use-svm-props"
#. type: Plain text
#: en/git-svn.txt:64
+#, priority:100
msgid "Set the 'useSvmProps' option in the [svn-remote] config."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--use-svnsync-props"
msgstr "--use-svnsync-props"
#. type: Plain text
#: en/git-svn.txt:66
+#, priority:100
msgid "Set the 'useSvnsyncProps' option in the [svn-remote] config."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:66
-#, no-wrap
+#, no-wrap, priority:100
msgid "--rewrite-root=<URL>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:68
+#, priority:100
msgid "Set the 'rewriteRoot' option in the [svn-remote] config."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:68
-#, no-wrap
+#, no-wrap, priority:100
msgid "--rewrite-uuid=<UUID>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:70
+#, priority:100
msgid "Set the 'rewriteUUID' option in the [svn-remote] config."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:70
-#, no-wrap
+#, no-wrap, priority:100
msgid "--username=<user>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:75
-msgid ""
-"For transports that SVN handles authentication for (http, https, and plain "
-"svn), specify the username. For other transports (e.g. `svn+ssh://`), you "
-"must include the username in the URL, "
-"e.g. `svn+ssh://foo@svn.bar.com/project`"
+#, priority:100
+msgid "For transports that SVN handles authentication for (http, https, and plain svn), specify the username. For other transports (e.g. `svn+ssh://`), you must include the username in the URL, e.g. `svn+ssh://foo@svn.bar.com/project`"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:90
-msgid ""
-"This allows one to specify a prefix which is prepended to the names of "
-"remotes if trunk/branches/tags are specified. The prefix does not "
-"automatically include a trailing slash, so be sure you include one in the "
-"argument if that is what you want. If --branches/-b is specified, the "
-"prefix must include a trailing slash. Setting a prefix (with a trailing "
-"slash) is strongly encouraged in any case, as your SVN-tracking refs will "
-"then be located at \"refs/remotes/$prefix/*\", which is compatible with "
-"Git's own remote-tracking ref layout (refs/remotes/$remote/*). Setting a "
-"prefix is also useful if you wish to track multiple projects that share a "
-"common repository. By default, the prefix is set to 'origin/'."
+#, priority:100
+msgid "This allows one to specify a prefix which is prepended to the names of remotes if trunk/branches/tags are specified. The prefix does not automatically include a trailing slash, so be sure you include one in the argument if that is what you want. If --branches/-b is specified, the prefix must include a trailing slash. Setting a prefix (with a trailing slash) is strongly encouraged in any case, as your SVN-tracking refs will then be located at \"refs/remotes/$prefix/*\", which is compatible with Git's own remote-tracking ref layout (refs/remotes/$remote/*). Setting a prefix is also useful if you wish to track multiple projects that share a common repository. By default, the prefix is set to 'origin/'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:97
-msgid ""
-"Before Git v2.0, the default prefix was \"\" (no prefix). This meant that "
-"SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with "
-"how Git's own remote-tracking refs are organized. If you still want the old "
-"default, you can get it by passing `--prefix \"\"` on the command line "
-"(`--prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
+#, priority:100
+msgid "Before Git v2.0, the default prefix was \"\" (no prefix). This meant that SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with how Git's own remote-tracking refs are organized. If you still want the old default, you can get it by passing `--prefix \"\"` on the command line (`--prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:98 en/git-svn.txt:145
-#, no-wrap
+#, no-wrap, priority:100
msgid "--ignore-refs=<regex>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:102
-msgid ""
-"When passed to 'init' or 'clone' this regular expression will be preserved "
-"as a config key. See 'fetch' for a description of `--ignore-refs`."
+#, priority:100
+msgid "When passed to 'init' or 'clone' this regular expression will be preserved as a config key. See 'fetch' for a description of `--ignore-refs`."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:102 en/git-svn.txt:157
-#, no-wrap
+#, no-wrap, priority:100
msgid "--ignore-paths=<regex>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:106
-msgid ""
-"When passed to 'init' or 'clone' this regular expression will be preserved "
-"as a config key. See 'fetch' for a description of `--ignore-paths`."
+#, priority:100
+msgid "When passed to 'init' or 'clone' this regular expression will be preserved as a config key. See 'fetch' for a description of `--ignore-paths`."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:106 en/git-svn.txt:186
-#, no-wrap
+#, no-wrap, priority:100
msgid "--include-paths=<regex>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:110
-msgid ""
-"When passed to 'init' or 'clone' this regular expression will be preserved "
-"as a config key. See 'fetch' for a description of `--include-paths`."
+#, priority:100
+msgid "When passed to 'init' or 'clone' this regular expression will be preserved as a config key. See 'fetch' for a description of `--include-paths`."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:110
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-minimize-url"
msgstr "--no-minimize-url"
#. type: Plain text
#: en/git-svn.txt:121
-msgid ""
-"When tracking multiple directories (using --stdlayout, --branches, or --tags "
-"options), git svn will attempt to connect to the root (or highest allowed "
-"level) of the Subversion repository. This default allows better tracking of "
-"history if entire projects are moved within a repository, but may cause "
-"issues on repositories where read access restrictions are in place. Passing "
-"`--no-minimize-url` will allow git svn to accept URLs as-is without "
-"attempting to connect to a higher level directory. This option is off by "
-"default when only one URL/branch is tracked (it would do little good)."
+#, priority:100
+msgid "When tracking multiple directories (using --stdlayout, --branches, or --tags options), git svn will attempt to connect to the root (or highest allowed level) of the Subversion repository. This default allows better tracking of history if entire projects are moved within a repository, but may cause issues on repositories where read access restrictions are in place. Passing `--no-minimize-url` will allow git svn to accept URLs as-is without attempting to connect to a higher level directory. This option is off by default when only one URL/branch is tracked (it would do little good)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:122
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'fetch'"
msgstr "'fetch'"
#. type: Plain text
#: en/git-svn.txt:127
-msgid ""
-"Fetch unfetched revisions from the Subversion remote we are tracking. The "
-"name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be "
-"specified as an optional command-line argument."
+#, ignore-ellipsis, priority:100
+msgid "Fetch unfetched revisions from the Subversion remote we are tracking. The name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be specified as an optional command-line argument."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:130 en/git-svn.txt:243
-msgid ""
-"This automatically updates the rev_map if needed (see "
-"'$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
+#, priority:100
+msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:131
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--localtime"
msgstr "--localtime"
#. type: Plain text
#: en/git-svn.txt:135
-msgid ""
-"Store Git commit times in the local time zone instead of UTC. This makes "
-"'git log' (even without --date=local) show the same times that `svn log` "
-"would in the local time zone."
+#, priority:100
+msgid "Store Git commit times in the local time zone instead of UTC. This makes 'git log' (even without --date=local) show the same times that `svn log` would in the local time zone."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:141
-msgid ""
-"This doesn't interfere with interoperating with the Subversion repository "
-"you cloned from, but if you wish for your local Git repository to be able to "
-"interoperate with someone else's local Git repository, either don't use this "
-"option or you should both use it in the same local time zone."
+#, priority:100
+msgid "This doesn't interfere with interoperating with the Subversion repository you cloned from, but if you wish for your local Git repository to be able to interoperate with someone else's local Git repository, either don't use this option or you should both use it in the same local time zone."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:142 en/git-svn.txt:536
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--parent"
msgstr "--parent"
#. type: Plain text
#: en/git-svn.txt:144
+#, priority:100
msgid "Fetch only from the SVN parent of the current HEAD."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:150
-msgid ""
-"Ignore refs for branches or tags matching the Perl regular expression. A "
-"\"negative look-ahead assertion\" like "
-"`^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to "
-"allow only certain refs."
+#, priority:100
+msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:153
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn-remote.<name>.ignore-refs\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:156
-msgid ""
-"If the ignore-refs configuration key is set, and the command-line option is "
-"also given, both regular expressions will be used."
+#, priority:100
+msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:163
-msgid ""
-"This allows one to specify a Perl regular expression that will cause "
-"skipping of all matching paths from checkout from SVN. The `--ignore-paths` "
-"option should match for every 'fetch' (including automatic fetches due to "
-"'clone', 'dcommit', 'rebase', etc) on a given repository."
+#, priority:100
+msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:166
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn-remote.<name>.ignore-paths\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:169
-msgid ""
-"If the ignore-paths configuration key is set, and the command-line option is "
-"also given, both regular expressions will be used."
+#, priority:100
+msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:173
-#, no-wrap
+#, no-wrap, priority:100
msgid "Skip \"doc*\" directory for every fetch"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:177
-#, no-wrap
+#, no-wrap, priority:100
msgid "--ignore-paths=\"^doc\"\n"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:179
-#, no-wrap
+#, no-wrap, priority:100
msgid "Skip \"branches\" and \"tags\" of first level directories"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:183
-#, no-wrap
+#, no-wrap, priority:100
msgid "--ignore-paths=\"^[^/]+/(?:branches|tags)\"\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:193
-msgid ""
-"This allows one to specify a Perl regular expression that will cause the "
-"inclusion of only matching paths from checkout from SVN. The "
-"`--include-paths` option should match for every 'fetch' (including automatic "
-"fetches due to 'clone', 'dcommit', 'rebase', etc) on a given "
-"repository. `--ignore-paths` takes precedence over `--include-paths`."
+#, priority:100
+msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:196
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn-remote.<name>.include-paths\n"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:197
-#, no-wrap
+#, no-wrap, priority:100
msgid "--log-window-size=<n>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:203
-msgid ""
-"Fetch <n> log entries per request when scanning Subversion history. The "
-"default is 100. For very large Subversion repositories, larger values may be "
-"needed for 'clone'/'fetch' to complete in reasonable time. But overly large "
-"values may lead to higher memory usage and request timeouts."
+#, priority:100
+msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:204
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'clone'"
msgstr "'clone'"
#. type: Plain text
#: en/git-svn.txt:214
-msgid ""
-"Runs 'init' and 'fetch'. It will automatically create a directory based on "
-"the basename of the URL passed to it; or if a second argument is passed; it "
-"will create a directory and work within that. It accepts all arguments that "
-"the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` "
-"and `--parent`. After a repository is cloned, the 'fetch' command will be "
-"able to update revisions without affecting the working tree; and the "
-"'rebase' command will be able to update the working tree with the latest "
-"changes."
+#, priority:100
+msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:215
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--preserve-empty-dirs"
msgstr "--preserve-empty-dirs"
#. type: Plain text
#: en/git-svn.txt:221
-msgid ""
-"Create a placeholder file in the local Git repository for each empty "
-"directory fetched from Subversion. This includes directories that become "
-"empty by removing all entries in the Subversion repository (but not the "
-"directory itself). The placeholder files are also tracked and removed when "
-"no longer necessary."
+#, priority:100
+msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:222
-#, no-wrap
+#, no-wrap, priority:100
msgid "--placeholder-filename=<filename>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:225
-msgid ""
-"Set the name of placeholder files created by --preserve-empty-dirs. "
-"Default: \".gitignore\""
+#, priority:100
+msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:226
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'rebase'"
msgstr "'rebase'"
#. type: Plain text
#: en/git-svn.txt:229
-msgid ""
-"This fetches revisions from the SVN parent of the current HEAD and rebases "
-"the current (uncommitted to SVN) work against it."
+#, priority:100
+msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:233
-msgid ""
-"This works similarly to `svn update` or 'git pull' except that it preserves "
-"linear history with 'git rebase' instead of 'git merge' for ease of "
-"dcommitting with 'git svn'."
+#, priority:100
+msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:237
-msgid ""
-"This accepts all options that 'git svn fetch' and 'git rebase' accept. "
-"However, `--fetch-all` only fetches from the current [svn-remote], and not "
-"all [svn-remote] definitions."
+#, priority:100
+msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:240
-msgid ""
-"Like 'git rebase'; this requires that the working tree be clean and have no "
-"uncommitted changes."
+#, priority:100
+msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:248
-msgid ""
-"Do not fetch remotely; only run 'git rebase' against the last fetched commit "
-"from the upstream SVN."
+#, priority:100
+msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:249
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'dcommit'"
msgstr "'dcommit'"
#. type: Plain text
#: en/git-svn.txt:254
-msgid ""
-"Commit each diff from the current branch directly to the SVN repository, and "
-"then rebase or reset (depending on whether or not there is a diff between "
-"SVN and head). This will create a revision in SVN for each commit in Git."
+#, priority:100
+msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:258
-msgid ""
-"When an optional Git branch name (or a Git commit object name) is specified "
-"as an argument, the subcommand works on the specified branch, not on the "
-"current branch."
+#, priority:100
+msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:260
+#, priority:100
msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:263
+#, priority:100
msgid "After committing, do not rebase or reset."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:263
-#, no-wrap
+#, no-wrap, priority:100
msgid "--commit-url <URL>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:269
-msgid ""
-"Commit to this SVN URL (the full path). This is intended to allow existing "
-"'git svn' repositories created with one transport method (e.g. `svn://` or "
-"`http://` for anonymous read) to be reused if a user is later given access "
-"to an alternate transport method (e.g. `svn+ssh://` or `https://`) for "
-"commit."
+#, priority:100
+msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:273
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"config key: svn-remote.<name>.commiturl\n"
-"config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl "
-"options)\n"
+"config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:277
-msgid ""
-"Note that the SVN URL of the commiturl config key includes the SVN branch. "
-"If you rather want to set the commit URL for an entire SVN repository use "
-"svn-remote.<name>.pushurl instead."
+#, priority:100
+msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:280
-msgid ""
-"Using this option for any other purpose (don't ask) is very strongly "
-"discouraged."
+#, priority:100
+msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:281
-#, no-wrap
+#, no-wrap, priority:100
msgid "--mergeinfo=<mergeinfo>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:288
-msgid ""
-"Add the given merge information during the dcommit "
-"(e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can "
-"store this information (as a property), and svn clients starting from "
-"version 1.5 can make use of it. To specify merge information from multiple "
-"branches, use a single space character between the branches "
-"(`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
+#, priority:100
+msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:291
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn.pushmergeinfo\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:296
-msgid ""
-"This option will cause git-svn to attempt to automatically populate the "
-"svn:mergeinfo property in the SVN repository when possible. Currently, this "
-"can only be done when dcommitting non-fast-forward merges where all parents "
-"but the first have already been pushed into SVN."
+#, priority:100
+msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:301
-msgid ""
-"Ask the user to confirm that a patch set should actually be sent to SVN. "
-"For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard "
-"this patch), \"all\" (accept all patches), or \"quit\"."
+#, priority:100
+msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:304
-msgid ""
-"'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", "
-"without committing anything to SVN."
+#, priority:100
+msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:305
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'branch'"
msgstr "'branch'"
#. type: Plain text
#: en/git-svn.txt:307
+#, priority:100
msgid "Create a branch in the SVN repository."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:309
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--message"
msgstr "--message"
#. type: Plain text
#: en/git-svn.txt:311
+#, priority:100
msgid "Allows to specify the commit message."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:313
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--tag"
msgstr "--tag"
#. type: Plain text
#: en/git-svn.txt:316
-msgid ""
-"Create a tag by using the tags_subdir instead of the branches_subdir "
-"specified during git svn init."
+#, priority:100
+msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:317
-#, no-wrap
+#, no-wrap, priority:100
msgid "-d<path>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:318
-#, no-wrap
+#, no-wrap, priority:100
msgid "--destination=<path>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:326
-msgid ""
-"If more than one --branches (or --tags) option was given to the 'init' or "
-"'clone' command, you must provide the location of the branch (or tag) you "
-"wish to create in the SVN repository. <path> specifies which path to use to "
-"create the branch or tag and should match the pattern on the left-hand side "
-"of one of the configured branches or tags refspecs. You can see these "
-"refspecs with the commands"
+#, priority:100
+msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:329
-msgid ""
-"git config --get-all svn-remote.<name>.branches git config --get-all "
-"svn-remote.<name>.tags"
+#, priority:100
+msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:332
-msgid ""
-"where <name> is the name of the SVN repository as specified by the -R option "
-"to 'init' (or \"svn\" by default)."
+#, priority:100
+msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:333
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--username"
msgstr "--username"
#. type: Plain text
#: en/git-svn.txt:336
-msgid ""
-"Specify the SVN username to perform the commit as. This option overrides "
-"the 'username' configuration property."
+#, priority:100
+msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:337
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--commit-url"
msgstr "--commit-url"
#. type: Plain text
#: en/git-svn.txt:342
-msgid ""
-"Use the specified URL to connect to the destination Subversion repository. "
-"This is useful in cases where the source SVN repository is read-only. This "
-"option overrides configuration property 'commiturl'."
+#, priority:100
+msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:344
+#, priority:100
msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:346 en/rev-list-options.txt:913
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
#. type: Plain text
#: en/git-svn.txt:350
-msgid ""
-"Create parent folders. This parameter is equivalent to the parameter "
-"--parents on svn cp commands and is useful for non-standard repository "
-"layouts."
+#, priority:100
+msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:351
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'tag'"
msgstr "'tag'"
#. type: Plain text
#: en/git-svn.txt:354
+#, priority:100
msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:355
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'log'"
msgstr "'log'"
#. type: Plain text
#: en/git-svn.txt:358
-msgid ""
-"This should make it easy to look up svn log messages when svn users refer to "
-"-r/--revision numbers."
+#, priority:100
+msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:360
+#, priority:100
msgid "The following features from `svn log' are supported:"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:362
-#, no-wrap
+#, no-wrap, priority:100
msgid "-r <n>[:<n>]"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:363
-#, no-wrap
+#, no-wrap, priority:100
msgid "--revision=<n>[:<n>]"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:366
+#, ignore-ellipsis, priority:100
msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:370
-msgid ""
-"it's not completely compatible with the --verbose output in svn log, but "
-"reasonably close."
+#, priority:100
+msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:370
-#, no-wrap
+#, no-wrap, priority:100
msgid "--limit=<n>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:373
+#, priority:100
msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:375
+#, priority:100
msgid "supported"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:378
+#, priority:100
msgid "New features:"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:380
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--show-commit"
msgstr "--show-commit"
#. type: Plain text
#: en/git-svn.txt:382
+#, priority:100
msgid "shows the Git commit sha1, as well"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:382 en/pretty-options.txt:31
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--oneline"
msgstr "--oneline"
#. type: Plain text
#: en/git-svn.txt:384
+#, priority:100
msgid "our version of --pretty=oneline"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:389
-msgid ""
-"SVN itself only stores times in UTC and nothing else. The regular svn client "
-"converts the UTC time to the local time (or based on the TZ= "
-"environment). This command has the same behaviour."
+#, priority:100
+msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:391
+#, priority:100
msgid "Any other arguments are passed directly to 'git log'"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:392
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'blame'"
msgstr "'blame'"
#. type: Plain text
#: en/git-svn.txt:399
-msgid ""
-"Show what revision and author last modified each line of a file. The output "
-"of this mode is format-compatible with the output of `svn blame' by "
-"default. Like the SVN blame command, local uncommitted changes in the "
-"working tree are ignored; the version of the file in the HEAD revision is "
-"annotated. Unknown arguments are passed directly to 'git blame'."
+#, priority:100
+msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:400
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--git-format"
msgstr "--git-format"
#. type: Plain text
#: en/git-svn.txt:405
-msgid ""
-"Produce output in the same format as 'git blame', but with SVN revision "
-"numbers instead of Git commit hashes. In this mode, changes that haven't "
-"been committed to SVN (including local working-copy edits) are shown as "
-"revision 0."
+#, priority:100
+msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:406
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'find-rev'"
msgstr "'find-rev'"
#. type: Plain text
#: en/git-svn.txt:411
-msgid ""
-"When given an SVN revision number of the form 'rN', returns the "
-"corresponding Git commit hash (this can optionally be followed by a tree-ish "
-"to specify which branch should be searched). When given a tree-ish, returns "
-"the corresponding SVN revision number."
+#, priority:100
+msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:412
-#, no-wrap
+#, no-wrap, priority:100
msgid "-B"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:413
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--before"
msgstr "--before"
#. type: Plain text
#: en/git-svn.txt:417
-msgid ""
-"Don't require an exact match if given an SVN revision, instead find the "
-"commit corresponding to the state of the SVN repository (on the current "
-"branch) at the specified revision."
+#, priority:100
+msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:419
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--after"
msgstr "--after"
#. type: Plain text
#: en/git-svn.txt:423
-msgid ""
-"Don't require an exact match if given an SVN revision; if there is not an "
-"exact match return the closest match searching forward in the history."
+#, priority:100
+msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:424
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'set-tree'"
msgstr "'set-tree'"
#. type: Plain text
#: en/git-svn.txt:432
-msgid ""
-"You should consider using 'dcommit' instead of this command. Commit "
-"specified commit or tree objects to SVN. This relies on your imported fetch "
-"data being up to date. This makes absolutely no attempts to do patching "
-"when committing to SVN, it simply overwrites files with those specified in "
-"the tree or commit. All merging is assumed to have taken place "
-"independently of 'git svn' functions."
+#, priority:100
+msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:433
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'create-ignore'"
msgstr "'create-ignore'"
#. type: Plain text
#: en/git-svn.txt:438
-msgid ""
-"Recursively finds the svn:ignore property on directories and creates "
-"matching .gitignore files. The resulting files are staged to be committed, "
-"but are not committed. Use -r/--revision to refer to a specific revision."
+#, priority:100
+msgid "Recursively finds the svn:ignore property on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:439
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'show-ignore'"
msgstr "'show-ignore'"
#. type: Plain text
#: en/git-svn.txt:443
-msgid ""
-"Recursively finds and lists the svn:ignore property on directories. The "
-"output is suitable for appending to the $GIT_DIR/info/exclude file."
+#, priority:100
+msgid "Recursively finds and lists the svn:ignore property on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:444
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'mkdirs'"
msgstr "'mkdirs'"
#. type: Plain text
#: en/git-svn.txt:452
-msgid ""
-"Attempts to recreate empty directories that core Git cannot track based on "
-"information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty "
-"directories are automatically recreated when using \"git svn clone\" and "
-"\"git svn rebase\", so \"mkdirs\" is intended for use after commands like "
-"\"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs "
-"config file option for more information.)"
+#, priority:100
+msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:453
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "'commit-diff'"
msgstr "'commit-diff'"
#. type: Plain text
#: en/git-svn.txt:462
-msgid ""
-"Commits the diff of two tree-ish arguments from the command-line. This "
-"command does not rely on being inside a `git svn init`-ed repository. This "
-"command takes three arguments, (a) the original tree to diff against, (b) "
-"the new tree result, (c) the URL of the target Subversion repository. The "
-"final argument (URL) may be omitted if you are working from a 'git "
-"svn'-aware repository (that has been `init`-ed with 'git svn'). The "
-"-r<revision> option is required for this."
+#, priority:100
+msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:467
-msgid ""
-"The commit message is supplied either directly with the `-m` or `-F` option, "
-"or indirectly from the tag or commit when the second tree-ish denotes such "
-"an object, or it is requested by invoking an editor (see `--edit` option "
-"below)."
+#, priority:100
+msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:472
-msgid ""
-"Use the given `msg` as the commit message. This option disables the `--edit` "
-"option."
+#, priority:100
+msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:473
-#, no-wrap
+#, no-wrap, priority:100
msgid "-F <filename>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:474
-#, no-wrap
+#, no-wrap, priority:100
msgid "--file=<filename>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:477
-msgid ""
-"Take the commit message from the given file. This option disables the "
-"`--edit` option."
+#, priority:100
+msgid "Take the commit message from the given file. This option disables the `--edit` option."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:478
-#, no-wrap
+#, no-wrap, priority:100
msgid "'info'"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:483
-msgid ""
-"Shows information about a file or directory similar to what `svn info' "
-"provides. Does not currently support a -r/--revision argument. Use the "
-"--url option to output only the value of the 'URL:' field."
+#, priority:100
+msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:484
-#, no-wrap
+#, no-wrap, priority:100
msgid "'proplist'"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:488
-msgid ""
-"Lists the properties stored in the Subversion repository about a given file "
-"or directory. Use -r/--revision to refer to a specific Subversion revision."
+#, priority:100
+msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:489
-#, no-wrap
+#, no-wrap, priority:100
msgid "'propget'"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:492
-msgid ""
-"Gets the Subversion property given as the first argument, for a file. A "
-"specific revision can be specified with -r/--revision."
+#, priority:100
+msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:493
-#, no-wrap
+#, no-wrap, priority:100
msgid "'propset'"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:497
-msgid ""
-"Sets the Subversion property given as the first argument, to the value given "
-"as the second argument for the file given as the third argument."
+#, priority:100
+msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:502
-#, no-wrap
+#, no-wrap, priority:100
msgid "git svn propset svn:keywords \"FreeBSD=%H\" devel/py-tipper/Makefile\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:506
-msgid ""
-"This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file "
-"'devel/py-tipper/Makefile'."
+#, priority:100
+msgid "This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file 'devel/py-tipper/Makefile'."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:507
-#, no-wrap
+#, no-wrap, priority:100
msgid "'show-externals'"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:510
-msgid ""
-"Shows the Subversion externals. Use -r/--revision to specify a specific "
-"revision."
+#, priority:100
+msgid "Shows the Subversion externals. Use -r/--revision to specify a specific revision."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:514
-msgid ""
-"Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove "
-"$GIT_DIR/svn/<refname>/index files."
+#, priority:100
+msgid "Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove $GIT_DIR/svn/<refname>/index files."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:515
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'reset'"
msgstr "'%Creset'"
#. type: Plain text
#: en/git-svn.txt:525
-msgid ""
-"Undoes the effects of 'fetch' back to the specified revision. This allows "
-"you to re-'fetch' an SVN revision. Normally the contents of an SVN revision "
-"should never change and 'reset' should not be necessary. However, if SVN "
-"permissions change, or if you alter your --ignore-paths option, a 'fetch' "
-"may fail with \"not found in commit\" (file not previously visible) or "
-"\"checksum mismatch\" (missed a modification). If the problem file cannot "
-"be ignored forever (with --ignore-paths) the only way to repair the repo is "
-"to use 'reset'."
+#, priority:100
+msgid "Undoes the effects of 'fetch' back to the specified revision. This allows you to re-'fetch' an SVN revision. Normally the contents of an SVN revision should never change and 'reset' should not be necessary. However, if SVN permissions change, or if you alter your --ignore-paths option, a 'fetch' may fail with \"not found in commit\" (file not previously visible) or \"checksum mismatch\" (missed a modification). If the problem file cannot be ignored forever (with --ignore-paths) the only way to repair the repo is to use 'reset'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:530
-msgid ""
-"Only the rev_map and refs/remotes/git-svn are changed (see "
-"'$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details). "
-"Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move "
-"local branches onto the new tree."
+#, priority:100
+msgid "Only the rev_map and refs/remotes/git-svn are changed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details). Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move local branches onto the new tree."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:531
-#, no-wrap
+#, no-wrap, priority:100
msgid "-r <n>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:532
-#, no-wrap
+#, no-wrap, priority:100
msgid "--revision=<n>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:535
-msgid ""
-"Specify the most recent revision to keep. All later revisions are "
-"discarded."
+#, priority:100
+msgid "Specify the most recent revision to keep. All later revisions are discarded."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:539
+#, priority:100
msgid "Discard the specified revision as well, keeping the nearest parent instead."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:541
+#, priority:100
msgid "Assume you have local changes in \"master\", but you need to refetch \"r2\"."
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:546
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" r1---r2---r3 remotes/git-svn\n"
" \\\n"
@@ -58269,14 +49921,13 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:550
-msgid ""
-"Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be "
-"incomplete in the first place. Then:"
+#, priority:100
+msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:554
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"git svn reset -r2 -p\n"
"git svn fetch\n"
@@ -58284,7 +49935,7 @@ msgstr ""
#. type: delimited block -
#: en/git-svn.txt:559
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" r1---r2'--r3' remotes/git-svn\n"
" \\\n"
@@ -58293,20 +49944,19 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:564
-msgid ""
-"Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your "
-"history will not be compatible with a future 'dcommit'!"
+#, priority:100
+msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:567
-#, no-wrap
+#, no-wrap, priority:100
msgid "git rebase --onto remotes/git-svn A^ master\n"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:572
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" r1---r2'--r3' remotes/git-svn\n"
" \\\n"
@@ -58315,116 +49965,109 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:577
-#, no-wrap
+#, no-wrap, priority:100
msgid "--shared[=(false|true|umask|group|all|world|everybody)]"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:581
+#, priority:100
msgid "Only used with the 'init' command. These are passed directly to 'git init'."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:582
-#, no-wrap
+#, no-wrap, priority:100
msgid "-r <arg>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:583
-#, no-wrap
+#, no-wrap, priority:100
msgid "--revision <arg>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:585
+#, priority:100
msgid "Used with the 'fetch' command."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:589
-msgid ""
-"This allows revision ranges for partial/cauterized history to be supported. "
-"$NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and BASE:$NUMBER "
-"are all supported."
+#, priority:100
+msgid "This allows revision ranges for partial/cauterized history to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and BASE:$NUMBER are all supported."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:593
-msgid ""
-"This can allow you to make partial mirrors when running fetch; but is "
-"generally not recommended because history will be skipped and lost."
+#, priority:100
+msgid "This can allow you to make partial mirrors when running fetch; but is generally not recommended because history will be skipped and lost."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:594
-#, no-wrap
+#, no-wrap, priority:100
msgid "-"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:597
+#, priority:100
msgid "Only used with the 'set-tree' command."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:601
-msgid ""
-"Read a list of commits from stdin and commit them in reverse order. Only "
-"the leading sha1 is read from each line, so 'git rev-list --pretty=oneline' "
-"output can be used."
+#, priority:100
+msgid "Read a list of commits from stdin and commit them in reverse order. Only the leading sha1 is read from each line, so 'git rev-list --pretty=oneline' output can be used."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:602
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--rmdir"
msgstr "--rmdir"
#. type: Plain text
#: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
+#, priority:100
msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:610
-msgid ""
-"Remove directories from the SVN tree if there are no files left behind. SVN "
-"can version empty directories, and they are not removed by default if there "
-"are no files left in them. Git cannot version empty directories. Enabling "
-"this flag will make the commit to SVN act like Git."
+#, priority:100
+msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:613
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn.rmdir\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:621
-msgid ""
-"Edit the commit message before committing to SVN. This is off by default "
-"for objects that are commits, and forced on when committing tree objects."
+#, priority:100
+msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:624
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn.edit\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:631
-msgid ""
-"They are both passed directly to 'git diff-tree'; see "
-"linkgit:git-diff-tree[1] for more information."
+#, priority:100
+msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:635
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"config key: svn.l\n"
"config key: svn.findcopiesharder\n"
@@ -58432,480 +50075,397 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:636
-#, no-wrap
+#, no-wrap, priority:100
msgid "-A<filename>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:637
-#, no-wrap
+#, no-wrap, priority:100
msgid "--authors-file=<filename>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:640
-msgid ""
-"Syntax is compatible with the file used by 'git cvsimport' but an empty "
-"email address can be supplied with '<>':"
+#, priority:100
+msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:643
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tloginname = Joe User <user@example.com>\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:650
-msgid ""
-"If this option is specified and 'git svn' encounters an SVN committer name "
-"that does not exist in the authors-file, 'git svn' will abort operation. The "
-"user will then have to add the appropriate entry. Re-running the previous "
-"'git svn' command after the authors-file is modified should continue "
-"operation."
+#, priority:100
+msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:653
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn.authorsfile\n"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:654
-#, no-wrap
+#, no-wrap, priority:100
msgid "--authors-prog=<filename>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:661
-msgid ""
-"If this option is specified, for each SVN committer name that does not exist "
-"in the authors file, the given file is executed with the committer name as "
-"the first argument. The program is expected to return a single line of the "
-"form \"Name <email>\" or \"Name <>\", which will be treated as if included "
-"in the authors file."
+#, priority:100
+msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:666
-msgid ""
-"Due to historical reasons a relative 'filename' is first searched relative "
-"to the current directory for 'init' and 'clone' and relative to the root of "
-"the working tree for 'fetch'. If 'filename' is not found, it is searched "
-"like any other command in '$PATH'."
+#, priority:100
+msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:669
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn.authorsProg\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:674
-msgid ""
-"Make 'git svn' less verbose. Specify a second time to make it even less "
-"verbose."
+#, priority:100
+msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:677
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "-s<strategy>"
msgstr "--strategy"
#. type: Labeled list
#: en/git-svn.txt:681
-#, no-wrap
+#, no-wrap, priority:100
msgid "--preserve-merges (DEPRECATED)"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:683
+#, priority:100
msgid "These are only used with the 'dcommit' and 'rebase' commands."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:686
-msgid ""
-"Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot "
-"be used (see 'dcommit')."
+#, priority:100
+msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:691
+#, priority:100
msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:694
-msgid ""
-"For 'dcommit', print out the series of Git arguments that would show which "
-"diffs would be committed to SVN."
+#, priority:100
+msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:698
-msgid ""
-"For 'rebase', display the local branch associated with the upstream svn "
-"repository associated with the current branch and the URL of svn repository "
-"that will be fetched from."
+#, priority:100
+msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:701
-msgid ""
-"For 'branch' and 'tag', display the urls that will be used for copying when "
-"creating the branch or tag."
+#, priority:100
+msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:702
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--use-log-author"
msgstr "--use-log-author"
#. type: Plain text
#: en/git-svn.txt:706
-msgid ""
-"When retrieving svn commits into Git (as part of 'fetch', 'rebase', or "
-"'dcommit' operations), look for the first `From:` or `Signed-off-by:` line "
-"in the log message and use that as the author string."
+#, priority:100
+msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line in the log message and use that as the author string."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:709
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn.useLogAuthor\n"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:710
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--add-author-from"
msgstr "--add-author-from"
#. type: Plain text
#: en/git-svn.txt:716
-msgid ""
-"When committing to svn from Git (as part of 'set-tree' or 'dcommit' "
-"operations), if the existing log message doesn't already have a `From:` or "
-"`Signed-off-by:` line, append a `From:` line based on the Git commit's "
-"author string. If you use this, then `--use-log-author` will retrieve a "
-"valid author string for all commits."
+#, priority:100
+msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by:` line, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:719
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn.addAuthorFrom\n"
msgstr ""
#. type: Title -
#: en/git-svn.txt:721
-#, no-wrap
+#, no-wrap, priority:100
msgid "ADVANCED OPTIONS"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:723
-#, no-wrap
+#, no-wrap, priority:100
msgid "-i<GIT_SVN_ID>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:724
-#, no-wrap
+#, no-wrap, priority:100
msgid "--id <GIT_SVN_ID>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:729
-msgid ""
-"This sets GIT_SVN_ID (instead of using the environment). This allows the "
-"user to override the default refname to fetch from when tracking a single "
-"URL. The 'log' and 'dcommit' commands no longer require this switch as an "
-"argument."
+#, priority:100
+msgid "This sets GIT_SVN_ID (instead of using the environment). This allows the user to override the default refname to fetch from when tracking a single URL. The 'log' and 'dcommit' commands no longer require this switch as an argument."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:730
-#, no-wrap
+#, no-wrap, priority:100
msgid "-R<remote name>"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:731
-#, no-wrap
+#, no-wrap, priority:100
msgid "--svn-remote <remote name>"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:735
-msgid ""
-"Specify the [svn-remote \"<remote name>\"] section to use, this allows SVN "
-"multiple repositories to be tracked. Default: \"svn\""
+#, priority:100
+msgid "Specify the [svn-remote \"<remote name>\"] section to use, this allows SVN multiple repositories to be tracked. Default: \"svn\""
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:736
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--follow-parent"
msgstr "--follow-parent"
#. type: Plain text
#: en/git-svn.txt:751
-msgid ""
-"This option is only relevant if we are tracking branches (using one of the "
-"repository layout options --trunk, --tags, --branches, --stdlayout). For "
-"each tracked branch, try to find out where its revision was copied from, and "
-"set a suitable parent in the first Git commit for the branch. This is "
-"especially helpful when we're tracking a directory that has been moved "
-"around within the repository. If this feature is disabled, the branches "
-"created by 'git svn' will all be linear and not share any history, meaning "
-"that there will be no information on where branches were branched off or "
-"merged. However, following long/convoluted histories can take a long time, "
-"so disabling this feature may speed up the cloning process. This feature is "
-"enabled by default, use --no-follow-parent to disable it."
+#, priority:100
+msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:754
-#, no-wrap
+#, no-wrap, priority:100
msgid "config key: svn.followparent\n"
msgstr ""
#. type: Title -
#: en/git-svn.txt:756
-#, no-wrap
+#, no-wrap, priority:100
msgid "CONFIG FILE-ONLY OPTIONS"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:758
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn.noMetadata"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:759
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn-remote.<name>.noMetadata"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:761
+#, priority:100
msgid "This gets rid of the 'git-svn-id:' lines at the end of every commit."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:766
-msgid ""
-"This option can only be used for one-shot imports as 'git svn' will not be "
-"able to fetch again without metadata. Additionally, if you lose your "
-"'$GIT_DIR/svn/\\**/.rev_map.*' files, 'git svn' will not be able to rebuild "
-"them."
+#, priority:100
+msgid "This option can only be used for one-shot imports as 'git svn' will not be able to fetch again without metadata. Additionally, if you lose your '$GIT_DIR/svn/\\**/.rev_map.*' files, 'git svn' will not be able to rebuild them."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:770
-msgid ""
-"The 'git svn log' command will not work on repositories using this, either. "
-"Using this conflicts with the 'useSvmProps' option for (hopefully) obvious "
-"reasons."
+#, priority:100
+msgid "The 'git svn log' command will not work on repositories using this, either. Using this conflicts with the 'useSvmProps' option for (hopefully) obvious reasons."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:778
-msgid ""
-"This option is NOT recommended as it makes it difficult to track down old "
-"references to SVN revision numbers in existing documentation, bug reports, "
-"and archives. If you plan to eventually migrate from SVN to Git and are "
-"certain about dropping SVN history, consider "
-"https://github.com/newren/git-filter-repo[git-filter-repo] instead. "
-"filter-repo also allows reformatting of metadata for ease-of-reading and "
-"rewriting authorship info for non-\"svn.authorsFile\" users."
+#, priority:100
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead. filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:779
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn.useSvmProps"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:780
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn-remote.<name>.useSvmProps"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:783
-msgid ""
-"This allows 'git svn' to re-map repository URLs and UUIDs from mirrors "
-"created using SVN::Mirror (or svk) for metadata."
+#, priority:100
+msgid "This allows 'git svn' to re-map repository URLs and UUIDs from mirrors created using SVN::Mirror (or svk) for metadata."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:791
-msgid ""
-"If an SVN revision has a property, \"svm:headrev\", it is likely that the "
-"revision was created by SVN::Mirror (also used by SVK). The property "
-"contains a repository UUID and a revision. We want to make it look like we "
-"are mirroring the original URL, so introduce a helper function that returns "
-"the original identity URL and UUID, and use it when generating metadata in "
-"commit messages."
+#, priority:100
+msgid "If an SVN revision has a property, \"svm:headrev\", it is likely that the revision was created by SVN::Mirror (also used by SVK). The property contains a repository UUID and a revision. We want to make it look like we are mirroring the original URL, so introduce a helper function that returns the original identity URL and UUID, and use it when generating metadata in commit messages."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:792
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn.useSvnsyncProps"
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:793
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn-remote.<name>.useSvnsyncprops"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:797
-msgid ""
-"Similar to the useSvmProps option; this is for users of the svnsync(1) "
-"command distributed with SVN 1.4.x and later."
+#, priority:100
+msgid "Similar to the useSvmProps option; this is for users of the svnsync(1) command distributed with SVN 1.4.x and later."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:798
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn-remote.<name>.rewriteRoot"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:804
-msgid ""
-"This allows users to create repositories from alternate URLs. For example, "
-"an administrator could run 'git svn' on the server locally (accessing via "
-"file://) but wish to distribute the repository with a public http:// or "
-"svn:// URL in the metadata so users of it will see the public URL."
+#, priority:100
+msgid "This allows users to create repositories from alternate URLs. For example, an administrator could run 'git svn' on the server locally (accessing via file://) but wish to distribute the repository with a public http:// or svn:// URL in the metadata so users of it will see the public URL."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:805
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn-remote.<name>.rewriteUUID"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:810
-msgid ""
-"Similar to the useSvmProps option; this is for users who need to remap the "
-"UUID manually. This may be useful in situations where the original UUID is "
-"not available via either useSvmProps or useSvnsyncProps."
+#, priority:100
+msgid "Similar to the useSvmProps option; this is for users who need to remap the UUID manually. This may be useful in situations where the original UUID is not available via either useSvmProps or useSvnsyncProps."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:811
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn-remote.<name>.pushurl"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:820
-msgid ""
-"Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in "
-"cases where 'url' points to an SVN repository via a read-only transport, to "
-"provide an alternate read/write transport. It is assumed that both keys "
-"point to the same repository. Unlike 'commiturl', 'pushurl' is a base "
-"path. If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes "
-"precedence."
+#, priority:100
+msgid "Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in cases where 'url' points to an SVN repository via a read-only transport, to provide an alternate read/write transport. It is assumed that both keys point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes precedence."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:821
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn.brokenSymlinkWorkaround"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:829
-msgid ""
-"This disables potentially expensive checks to workaround broken symlinks "
-"checked into SVN by broken clients. Set this option to \"false\" if you "
-"track a SVN repository with many empty blobs that are not symlinks. This "
-"option may be changed while 'git svn' is running and take effect on the next "
-"revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
+#, priority:100
+msgid "This disables potentially expensive checks to workaround broken symlinks checked into SVN by broken clients. Set this option to \"false\" if you track a SVN repository with many empty blobs that are not symlinks. This option may be changed while 'git svn' is running and take effect on the next revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:830
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn.pathnameencoding"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:835
-msgid ""
-"This instructs git svn to recode pathnames to a given encoding. It can be "
-"used by windows users and by those who work in non-utf8 locales to avoid "
-"corrupted file names with non-ASCII characters. Valid encodings are the "
-"ones supported by Perl's Encode module."
+#, priority:100
+msgid "This instructs git svn to recode pathnames to a given encoding. It can be used by windows users and by those who work in non-utf8 locales to avoid corrupted file names with non-ASCII characters. Valid encodings are the ones supported by Perl's Encode module."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:836
-#, no-wrap
+#, no-wrap, priority:100
msgid "svn-remote.<name>.automkdirs"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:843
-msgid ""
-"Normally, the \"git svn clone\" and \"git svn rebase\" commands attempt to "
-"recreate empty directories that are in the Subversion repository. If this "
-"option is set to \"false\", then empty directories will only be created if "
-"the \"git svn mkdirs\" command is run explicitly. If unset, 'git svn' "
-"assumes this option to be \"true\"."
+#, priority:100
+msgid "Normally, the \"git svn clone\" and \"git svn rebase\" commands attempt to recreate empty directories that are in the Subversion repository. If this option is set to \"false\", then empty directories will only be created if the \"git svn mkdirs\" command is run explicitly. If unset, 'git svn' assumes this option to be \"true\"."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:848
-msgid ""
-"Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and "
-"useSvmProps options all affect the metadata generated and used by 'git svn'; "
-"they *must* be set in the configuration file before any history is imported "
-"and these settings should never be changed once they are set."
+#, priority:100
+msgid "Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps options all affect the metadata generated and used by 'git svn'; they *must* be set in the configuration file before any history is imported and these settings should never be changed once they are set."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:852
-msgid ""
-"Additionally, only one of these options can be used per svn-remote section "
-"because they affect the 'git-svn-id:' metadata line, except for rewriteRoot "
-"and rewriteUUID which can be used together."
+#, priority:100
+msgid "Additionally, only one of these options can be used per svn-remote section because they affect the 'git-svn-id:' metadata line, except for rewriteRoot and rewriteUUID which can be used together."
msgstr ""
#. type: Title -
#: en/git-svn.txt:855
-#, no-wrap
+#, no-wrap, priority:100
msgid "BASIC EXAMPLES"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:859
-msgid ""
-"Tracking and contributing to the trunk of a Subversion-managed project "
-"(ignoring tags and branches):"
+#, priority:100
+msgid "Tracking and contributing to the trunk of a Subversion-managed project (ignoring tags and branches):"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:877
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"# Clone a repo (like git clone):\n"
"\tgit svn clone http://svn.example.com/project/trunk\n"
@@ -58918,8 +50478,7 @@ msgid ""
"# Something is committed to SVN, rebase your local changes against the\n"
"# latest changes in SVN:\n"
"\tgit svn rebase\n"
-"# Now commit your changes (that were committed previously using Git) to "
-"SVN,\n"
+"# Now commit your changes (that were committed previously using Git) to SVN,\n"
"# as well as automatically updating your working HEAD:\n"
"\tgit svn dcommit\n"
"# Append svn:ignore settings to the default Git exclude file:\n"
@@ -58928,20 +50487,18 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:881
-msgid ""
-"Tracking and contributing to an entire Subversion-managed project (complete "
-"with a trunk, tags and branches):"
+#, priority:100
+msgid "Tracking and contributing to an entire Subversion-managed project (complete with a trunk, tags and branches):"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:896
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"# Clone a repo with standard SVN directory layout (like git clone):\n"
"\tgit svn clone http://svn.example.com/project --stdlayout --prefix svn/\n"
"# Or, if the repo uses a non-standard directory layout:\n"
-"\tgit svn clone http://svn.example.com/project -T tr -b branch -t tag "
-"--prefix svn/\n"
+"\tgit svn clone http://svn.example.com/project -T tr -b branch -t tag --prefix svn/\n"
"# View all branches and tags you have cloned:\n"
"\tgit branch -r\n"
"# Create a new branch in SVN\n"
@@ -58955,29 +50512,22 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:904
-msgid ""
-"The initial 'git svn clone' can be quite time-consuming (especially for "
-"large Subversion repositories). If multiple people (or one person with "
-"multiple machines) want to use 'git svn' to interact with the same "
-"Subversion repository, you can do the initial 'git svn clone' to a "
-"repository on a server and have each person clone that repository with 'git "
-"clone':"
+#, priority:100
+msgid "The initial 'git svn clone' can be quite time-consuming (especially for large Subversion repositories). If multiple people (or one person with multiple machines) want to use 'git svn' to interact with the same Subversion repository, you can do the initial 'git svn clone' to a repository on a server and have each person clone that repository with 'git clone':"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:925
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"# Do the initial import on a server\n"
-"\tssh server \"cd /pub && git svn clone http://svn.example.com/project "
-"[options...]\"\n"
+"\tssh server \"cd /pub && git svn clone http://svn.example.com/project [options...]\"\n"
"# Clone locally - make sure the refs/remotes/ space matches the server\n"
"\tmkdir project\n"
"\tcd project\n"
"\tgit init\n"
"\tgit remote add origin server:/pub/project\n"
-"\tgit config --replace-all remote.origin.fetch "
-"'+refs/remotes/*:refs/remotes/*'\n"
+"\tgit config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'\n"
"\tgit fetch\n"
"# Prevent fetch/pull from remote Git server in the future,\n"
"# we only want to use git svn for future updates\n"
@@ -58993,217 +50543,133 @@ msgstr ""
#. type: Title -
#: en/git-svn.txt:928
-#, no-wrap
+#, no-wrap, priority:100
msgid "REBASE VS. PULL/MERGE"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:934
-msgid ""
-"Prefer to use 'git svn rebase' or 'git rebase', rather than 'git pull' or "
-"'git merge' to synchronize unintegrated commits with a 'git svn' "
-"branch. Doing so will keep the history of unintegrated commits linear with "
-"respect to the upstream SVN repository and allow the use of the preferred "
-"'git svn dcommit' subcommand to push unintegrated commits back into SVN."
+#, priority:100
+msgid "Prefer to use 'git svn rebase' or 'git rebase', rather than 'git pull' or 'git merge' to synchronize unintegrated commits with a 'git svn' branch. Doing so will keep the history of unintegrated commits linear with respect to the upstream SVN repository and allow the use of the preferred 'git svn dcommit' subcommand to push unintegrated commits back into SVN."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:942
-msgid ""
-"Originally, 'git svn' recommended that developers pulled or merged from the "
-"'git svn' branch. This was because the author favored `git svn set-tree B` "
-"to commit a single head rather than the `git svn set-tree A..B` notation to "
-"commit multiple commits. Use of 'git pull' or 'git merge' with `git svn "
-"set-tree A..B` will cause non-linear history to be flattened when committing "
-"into SVN and this can lead to merge commits unexpectedly reversing previous "
-"commits in SVN."
+#, priority:100
+msgid "Originally, 'git svn' recommended that developers pulled or merged from the 'git svn' branch. This was because the author favored `git svn set-tree B` to commit a single head rather than the `git svn set-tree A..B` notation to commit multiple commits. Use of 'git pull' or 'git merge' with `git svn set-tree A..B` will cause non-linear history to be flattened when committing into SVN and this can lead to merge commits unexpectedly reversing previous commits in SVN."
msgstr ""
#. type: Title -
#: en/git-svn.txt:944
-#, no-wrap
+#, no-wrap, priority:100
msgid "MERGE TRACKING"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:951
-msgid ""
-"While 'git svn' can track copy history (including branches and tags) for "
-"repositories adopting a standard layout, it cannot yet represent merge "
-"history that happened inside git back upstream to SVN users. Therefore it "
-"is advised that users keep history as linear as possible inside Git to ease "
-"compatibility with SVN (see the CAVEATS section below)."
+#, priority:100
+msgid "While 'git svn' can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that users keep history as linear as possible inside Git to ease compatibility with SVN (see the CAVEATS section below)."
msgstr ""
#. type: Title -
#: en/git-svn.txt:953
-#, no-wrap
+#, no-wrap, priority:100
msgid "HANDLING OF SVN BRANCHES"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:961
-msgid ""
-"If 'git svn' is configured to fetch branches (and --follow-branches is in "
-"effect), it sometimes creates multiple Git branches for one SVN branch, "
-"where the additional branches have names of the form 'branchname@nnn' (with "
-"nnn an SVN revision number). These additional branches are created if 'git "
-"svn' cannot find a parent commit for the first commit in an SVN branch, to "
-"connect the branch to the history of the other branches."
+#, priority:100
+msgid "If 'git svn' is configured to fetch branches (and --follow-branches is in effect), it sometimes creates multiple Git branches for one SVN branch, where the additional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number). These additional branches are created if 'git svn' cannot find a parent commit for the first commit in an SVN branch, to connect the branch to the history of the other branches."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:977
-msgid ""
-"Normally, the first commit in an SVN branch consists of a copy "
-"operation. 'git svn' will read this commit to get the SVN revision the "
-"branch was created from. It will then try to find the Git commit that "
-"corresponds to this SVN revision, and use that as the parent of the "
-"branch. However, it is possible that there is no suitable Git commit to "
-"serve as parent. This will happen, among other reasons, if the SVN branch "
-"is a copy of a revision that was not fetched by 'git svn' (e.g. because it "
-"is an old revision that was skipped with `--revision`), or if in SVN a "
-"directory was copied that is not tracked by 'git svn' (such as a branch that "
-"is not tracked at all, or a subdirectory of a tracked branch). In these "
-"cases, 'git svn' will still create a Git branch, but instead of using an "
-"existing Git commit as the parent of the branch, it will read the SVN "
-"history of the directory the branch was copied from and create appropriate "
-"Git commits. This is indicated by the message \"Initializing parent: "
-"<branchname>\"."
+#, priority:100
+msgid "Normally, the first commit in an SVN branch consists of a copy operation. 'git svn' will read this commit to get the SVN revision the branch was created from. It will then try to find the Git commit that corresponds to this SVN revision, and use that as the parent of the branch. However, it is possible that there is no suitable Git commit to serve as parent. This will happen, among other reasons, if the SVN branch is a copy of a revision that was not fetched by 'git svn' (e.g. because it is an old revision that was skipped with `--revision`), or if in SVN a directory was copied that is not tracked by 'git svn' (such as a branch that is not tracked at all, or a subdirectory of a tracked branch). In these cases, 'git svn' will still create a Git branch, but instead of using an existing Git commit as the parent of the branch, it will read the SVN history of the directory the branch was copied from and create appropriate Git commits. This is indicated by the message \"Initializing parent: <branchname>\"."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:984
-msgid ""
-"Additionally, it will create a special branch named "
-"'<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision "
-"number the branch was copied from. This branch will point to the newly "
-"created parent commit of the branch. If in SVN the branch was deleted and "
-"later recreated from a different version, there will be multiple such "
-"branches with an '@'."
+#, priority:100
+msgid "Additionally, it will create a special branch named '<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision number the branch was copied from. This branch will point to the newly created parent commit of the branch. If in SVN the branch was deleted and later recreated from a different version, there will be multiple such branches with an '@'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:987
-msgid ""
-"Note that this may mean that multiple Git commits are created for a single "
-"SVN revision."
+#, priority:100
+msgid "Note that this may mean that multiple Git commits are created for a single SVN revision."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:997
-msgid ""
-"An example: in an SVN repository with a standard trunk/tags/branches layout, "
-"a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched "
-"by copying it to branches/. 'git svn clone -s' will then create a branch "
-"'sub'. It will also create new Git commits for r.100 through r.199 and use "
-"these as the history of branch 'sub'. Thus there will be two Git commits for "
-"each revision from r.100 to r.199 (one containing trunk/, one containing "
-"trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new "
-"parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/)."
+#, priority:100
+msgid "An example: in an SVN repository with a standard trunk/tags/branches layout, a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched by copying it to branches/. 'git svn clone -s' will then create a branch 'sub'. It will also create new Git commits for r.100 through r.199 and use these as the history of branch 'sub'. Thus there will be two Git commits for each revision from r.100 to r.199 (one containing trunk/, one containing trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/)."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1007
-msgid ""
-"For the sake of simplicity and interoperating with Subversion, it is "
-"recommended that all 'git svn' users clone, fetch and dcommit directly from "
-"the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations "
-"between Git repositories and branches. The recommended method of exchanging "
-"code between Git branches and users is 'git format-patch' and 'git am', or "
-"just 'dcommit'ing to the SVN repository."
+#, priority:100
+msgid "For the sake of simplicity and interoperating with Subversion, it is recommended that all 'git svn' users clone, fetch and dcommit directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations between Git repositories and branches. The recommended method of exchanging code between Git branches and users is 'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1013
-msgid ""
-"Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to "
-"'dcommit' from because Subversion users cannot see any merges you've made. "
-"Furthermore, if you merge or pull from a Git branch that is a mirror of an "
-"SVN branch, 'dcommit' may commit to the wrong branch."
+#, priority:100
+msgid "Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to 'dcommit' from because Subversion users cannot see any merges you've made. Furthermore, if you merge or pull from a Git branch that is a mirror of an SVN branch, 'dcommit' may commit to the wrong branch."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1016
-msgid ""
-"If you do merge, note the following rule: 'git svn dcommit' will attempt to "
-"commit on top of the SVN commit named in"
+#, priority:100
+msgid "If you do merge, note the following rule: 'git svn dcommit' will attempt to commit on top of the SVN commit named in"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:1018
-#, no-wrap
+#, no-wrap, priority:100
msgid "git log --grep=^git-svn-id: --first-parent -1\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1023
-msgid ""
-"You 'must' therefore ensure that the most recent commit of the branch you "
-"want to dcommit to is the 'first' parent of the merge. Chaos will ensue "
-"otherwise, especially if the first parent is an older commit on the same SVN "
-"branch."
+#, priority:100
+msgid "You 'must' therefore ensure that the most recent commit of the branch you want to dcommit to is the 'first' parent of the merge. Chaos will ensue otherwise, especially if the first parent is an older commit on the same SVN branch."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1028
-msgid ""
-"'git clone' does not clone branches under the refs/remotes/ hierarchy or any "
-"'git svn' metadata, or config. So repositories created and managed with "
-"using 'git svn' should use 'rsync' for cloning, if cloning is to be done at "
-"all."
+#, priority:100
+msgid "'git clone' does not clone branches under the refs/remotes/ hierarchy or any 'git svn' metadata, or config. So repositories created and managed with using 'git svn' should use 'rsync' for cloning, if cloning is to be done at all."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1033
-msgid ""
-"Since 'dcommit' uses rebase internally, any Git branches you 'git push' to "
-"before 'dcommit' on will require forcing an overwrite of the existing ref on "
-"the remote repository. This is generally considered bad practice, see the "
-"linkgit:git-push[1] documentation for details."
+#, priority:100
+msgid "Since 'dcommit' uses rebase internally, any Git branches you 'git push' to before 'dcommit' on will require forcing an overwrite of the existing ref on the remote repository. This is generally considered bad practice, see the linkgit:git-push[1] documentation for details."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1038
-msgid ""
-"Do not use the --amend option of linkgit:git-commit[1] on a change you've "
-"already dcommitted. It is considered bad practice to --amend commits you've "
-"already pushed to a remote repository for other users, and dcommit with SVN "
-"is analogous to that."
+#, priority:100
+msgid "Do not use the --amend option of linkgit:git-commit[1] on a change you've already dcommitted. It is considered bad practice to --amend commits you've already pushed to a remote repository for other users, and dcommit with SVN is analogous to that."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1053
-msgid ""
-"When cloning an SVN repository, if none of the options for describing the "
-"repository layout is used (--trunk, --tags, --branches, --stdlayout), 'git "
-"svn clone' will create a Git repository with completely linear history, "
-"where branches and tags appear as separate directories in the working copy. "
-"While this is the easiest way to get a copy of a complete repository, for "
-"projects with many branches it will lead to a working copy many times larger "
-"than just the trunk. Thus for projects using the standard directory "
-"structure (trunk/branches/tags), it is recommended to clone with option "
-"`--stdlayout`. If the project uses a non-standard structure, and/or if "
-"branches and tags are not required, it is easiest to only clone one "
-"directory (typically trunk), without giving any repository layout options. "
-"If the full history with branches and tags is required, the options "
-"`--trunk` / `--branches` / `--tags` must be used."
+#, priority:100
+msgid "When cloning an SVN repository, if none of the options for describing the repository layout is used (--trunk, --tags, --branches, --stdlayout), 'git svn clone' will create a Git repository with completely linear history, where branches and tags appear as separate directories in the working copy. While this is the easiest way to get a copy of a complete repository, for projects with many branches it will lead to a working copy many times larger than just the trunk. Thus for projects using the standard directory structure (trunk/branches/tags), it is recommended to clone with option `--stdlayout`. If the project uses a non-standard structure, and/or if branches and tags are not required, it is easiest to only clone one directory (typically trunk), without giving any repository layout options. If the full history with branches and tags is required, the options `--trunk` / `--branches` / `--tags` must be used."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1060
-msgid ""
-"When using multiple --branches or --tags, 'git svn' does not automatically "
-"handle name collisions (for example, if two branches from different paths "
-"have the same name, or if a branch and a tag have the same name). In these "
-"cases, use 'init' to set up your Git repository then, before your first "
-"'fetch', edit the $GIT_DIR/config file so that the branches and tags are "
-"associated with different name spaces. For example:"
+#, priority:100
+msgid "When using multiple --branches or --tags, 'git svn' does not automatically handle name collisions (for example, if two branches from different paths have the same name, or if a branch and a tag have the same name). In these cases, use 'init' to set up your Git repository then, before your first 'fetch', edit the $GIT_DIR/config file so that the branches and tags are associated with different name spaces. For example:"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1063
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tbranches = stable/*:refs/remotes/svn/stable/*\n"
"\tbranches = debug/*:refs/remotes/svn/debug/*\n"
@@ -59211,45 +50677,31 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1069
-msgid ""
-"We ignore all SVN properties except svn:executable. Any unhandled "
-"properties are logged to $GIT_DIR/svn/<refname>/unhandled.log"
+#, priority:100
+msgid "We ignore all SVN properties except svn:executable. Any unhandled properties are logged to $GIT_DIR/svn/<refname>/unhandled.log"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1076
-msgid ""
-"Renamed and copied directories are not detected by Git and hence not tracked "
-"when committing to SVN. I do not plan on adding support for this as it's "
-"quite difficult and time-consuming to get working for all the possible "
-"corner cases (Git doesn't do it, either). Committing renamed and copied "
-"files is fully supported if they're similar enough for Git to detect them."
+#, priority:100
+msgid "Renamed and copied directories are not detected by Git and hence not tracked when committing to SVN. I do not plan on adding support for this as it's quite difficult and time-consuming to get working for all the possible corner cases (Git doesn't do it, either). Committing renamed and copied files is fully supported if they're similar enough for Git to detect them."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1082
-msgid ""
-"In SVN, it is possible (though discouraged) to commit changes to a tag "
-"(because a tag is just a directory copy, thus technically the same as a "
-"branch). When cloning an SVN repository, 'git svn' cannot know if such a "
-"commit to a tag will happen in the future. Thus it acts conservatively and "
-"imports all SVN tags as branches, prefixing the tag name with 'tags/'."
+#, priority:100
+msgid "In SVN, it is possible (though discouraged) to commit changes to a tag (because a tag is just a directory copy, thus technically the same as a branch). When cloning an SVN repository, 'git svn' cannot know if such a commit to a tag will happen in the future. Thus it acts conservatively and imports all SVN tags as branches, prefixing the tag name with 'tags/'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1093
-msgid ""
-"'git svn' stores [svn-remote] configuration information in the repository "
-"$GIT_DIR/config file. It is similar the core Git [remote] sections except "
-"'fetch' keys do not accept glob arguments; but they are instead handled by "
-"the 'branches' and 'tags' keys. Since some SVN repositories are oddly "
-"configured with multiple projects glob expansions such those listed below "
-"are allowed:"
+#, priority:100
+msgid "'git svn' stores [svn-remote] configuration information in the repository $GIT_DIR/config file. It is similar the core Git [remote] sections except 'fetch' keys do not accept glob arguments; but they are instead handled by the 'branches' and 'tags' keys. Since some SVN repositories are oddly configured with multiple projects glob expansions such those listed below are allowed:"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:1102
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[svn-remote \"project-a\"]\n"
"\turl = http://server.org/svn\n"
@@ -59262,7 +50714,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1110
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Keep in mind that the `*` (asterisk) wildcard of the local ref\n"
"(right of the `:`) *must* be the farthest right path component;\n"
@@ -59274,41 +50726,43 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1112
+#, priority:100
msgid "Also note that only one asterisk is allowed per word. For example:"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1114
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tbranches = branches/re*se:refs/remotes/project-a/branches/*\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1116
+#, priority:100
msgid "will match branches 'release', 'rese', 're123se', however"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1118
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tbranches = branches/re*s*e:refs/remotes/project-a/branches/*\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1120
+#, priority:100
msgid "will produce an error."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1123
-msgid ""
-"It is also possible to fetch a subset of branches or tags by using a "
-"comma-separated list of names within braces. For example:"
+#, priority:100
+msgid "It is also possible to fetch a subset of branches or tags by using a comma-separated list of names within braces. For example:"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:1130
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[svn-remote \"huge-project\"]\n"
"\turl = http://server.org/svn\n"
@@ -59319,18 +50773,18 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1133
+#, priority:100
msgid "Multiple fetch, branches, and tags keys are supported:"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:1142
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"[svn-remote \"messy-repo\"]\n"
"\turl = http://server.org/svn\n"
"\tfetch = trunk/project-a:refs/remotes/project-a/trunk\n"
-"\tfetch = "
-"branches/demos/june-project-a-demo:refs/remotes/project-a/demos/june-demo\n"
+"\tfetch = branches/demos/june-project-a-demo:refs/remotes/project-a/demos/june-demo\n"
"\tbranches = branches/server/*:refs/remotes/project-a/branches/*\n"
"\tbranches = branches/demos/2011/*:refs/remotes/project-a/2011-demos/*\n"
"\ttags = tags/server/*:refs/remotes/project-a/tags/*\n"
@@ -59338,63 +50792,55 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1146
-msgid ""
-"Creating a branch in such a configuration requires disambiguating which "
-"location to use using the -d or --destination flag:"
+#, priority:100
+msgid "Creating a branch in such a configuration requires disambiguating which location to use using the -d or --destination flag:"
msgstr ""
#. type: delimited block -
#: en/git-svn.txt:1149
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git svn branch -d branches/server release-2-3-0\n"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1155
-msgid ""
-"Note that git-svn keeps track of the highest revision in which a branch or "
-"tag has appeared. If the subset of branches or tags is changed after "
-"fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove (or "
-"reset) branches-maxRev and/or tags-maxRev as appropriate."
+#, priority:100
+msgid "Note that git-svn keeps track of the highest revision in which a branch or tag has appeared. If the subset of branches or tags is changed after fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove (or reset) branches-maxRev and/or tags-maxRev as appropriate."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:1158
-#, no-wrap
+#, no-wrap, priority:100
msgid "$GIT_DIR/svn/\\**/.rev_map.*"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1164
-msgid ""
-"Mapping between Subversion revision numbers and Git commit names. In a "
-"repository where the noMetadata option is not set, this can be rebuilt from "
-"the git-svn-id: lines that are at the end of every commit (see the "
-"'svn.noMetadata' section above for details)."
+#, priority:100
+msgid "Mapping between Subversion revision numbers and Git commit names. In a repository where the noMetadata option is not set, this can be rebuilt from the git-svn-id: lines that are at the end of every commit (see the 'svn.noMetadata' section above for details)."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1168
-msgid ""
-"'git svn fetch' and 'git svn rebase' automatically update the rev_map if it "
-"is missing or not up to date. 'git svn reset' automatically rewinds it."
+#, priority:100
+msgid "'git svn fetch' and 'git svn rebase' automatically update the rev_map if it is missing or not up to date. 'git svn reset' automatically rewinds it."
msgstr ""
#. type: Title =
#: en/git-switch.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-switch(1)"
msgstr "git-switch(1)"
#. type: Plain text
#: en/git-switch.txt:7
+#, priority:100
msgid "git-switch - Switch branches"
msgstr ""
#. type: Plain text
#: en/git-switch.txt:15
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git switch' [<options>] [--no-guess] <branch>\n"
"'git switch' [<options>] --detach [<start-point>]\n"
@@ -59404,79 +50850,67 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:21
-msgid ""
-"Switch to a specified branch. The working tree and the index are updated to "
-"match the branch. All new commits will be added to the tip of this branch."
+#, priority:100
+msgid "Switch to a specified branch. The working tree and the index are updated to match the branch. All new commits will be added to the tip of this branch."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:26
-msgid ""
-"Optionally a new branch could be created with either `-c`, `-C`, "
-"automatically from a remote branch of same name (see `--guess`), or detach "
-"the working tree from any branch with `--detach`, along with switching."
+#, priority:100
+msgid "Optionally a new branch could be created with either `-c`, `-C`, automatically from a remote branch of same name (see `--guess`), or detach the working tree from any branch with `--detach`, along with switching."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:31
-msgid ""
-"Switching branches does not require a clean index and working tree (i.e. no "
-"differences compared to `HEAD`). The operation is aborted however if the "
-"operation leads to loss of local changes, unless told otherwise with "
-"`--discard-changes` or `--merge`."
+#, priority:100
+msgid "Switching branches does not require a clean index and working tree (i.e. no differences compared to `HEAD`). The operation is aborted however if the operation leads to loss of local changes, unless told otherwise with `--discard-changes` or `--merge`."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:38
+#, priority:100
msgid "Branch to switch to."
msgstr ""
#. type: Labeled list
#: en/git-switch.txt:39
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "<new-branch>"
msgstr "nueva-rama"
#. type: Plain text
#: en/git-switch.txt:48
-msgid ""
-"The starting point for the new branch. Specifying a `<start-point>` allows "
-"you to create a branch based on some other point in history than where HEAD "
-"currently points. (Or, in the case of `--detach`, allows you to inspect and "
-"detach from some other point.)"
+#, priority:100
+msgid "The starting point for the new branch. Specifying a `<start-point>` allows you to create a branch based on some other point in history than where HEAD currently points. (Or, in the case of `--detach`, allows you to inspect and detach from some other point.)"
msgstr ""
#. type: Plain text
#: en/git-switch.txt:54
-msgid ""
-"You can use the `@{-N}` syntax to refer to the N-th last branch/commit "
-"switched to using \"git switch\" or \"git checkout\" operation. You may also "
-"specify `-` which is synonymous to `@{-1}`. This is often used to switch "
-"quickly between two branches, or to undo a branch switch by mistake."
+#, priority:100
+msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit switched to using \"git switch\" or \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`. This is often used to switch quickly between two branches, or to undo a branch switch by mistake."
msgstr ""
#. type: Labeled list
#: en/git-switch.txt:59
-#, no-wrap
+#, no-wrap, priority:100
msgid "-c <new-branch>"
msgstr ""
#. type: Labeled list
#: en/git-switch.txt:60
-#, no-wrap
+#, no-wrap, priority:100
msgid "--create <new-branch>"
msgstr ""
#. type: Plain text
#: en/git-switch.txt:64
-msgid ""
-"Create a new branch named `<new-branch>` starting at `<start-point>` before "
-"switching to the branch. This is a convenient shortcut for:"
+#, priority:100
+msgid "Create a new branch named `<new-branch>` starting at `<start-point>` before switching to the branch. This is a convenient shortcut for:"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:68
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git branch <new-branch>\n"
"$ git switch <new-branch>\n"
@@ -59484,26 +50918,25 @@ msgstr ""
#. type: Labeled list
#: en/git-switch.txt:70
-#, no-wrap
+#, no-wrap, priority:100
msgid "-C <new-branch>"
msgstr ""
#. type: Labeled list
#: en/git-switch.txt:71
-#, no-wrap
+#, no-wrap, priority:100
msgid "--force-create <new-branch>"
msgstr ""
#. type: Plain text
#: en/git-switch.txt:75
-msgid ""
-"Similar to `--create` except that if `<new-branch>` already exists, it will "
-"be reset to `<start-point>`. This is a convenient shortcut for:"
+#, priority:100
+msgid "Similar to `--create` except that if `<new-branch>` already exists, it will be reset to `<start-point>`. This is a convenient shortcut for:"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:79
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git branch -f <new-branch>\n"
"$ git switch <new-branch>\n"
@@ -59511,133 +50944,109 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:86
-msgid ""
-"Switch to a commit for inspection and discardable experiments. See the "
-"\"DETACHED HEAD\" section in linkgit:git-checkout[1] for details."
+#, priority:100
+msgid "Switch to a commit for inspection and discardable experiments. See the \"DETACHED HEAD\" section in linkgit:git-checkout[1] for details."
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:95
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git switch -c <branch> --track <remote>/<branch>\n"
msgstr ""
#. type: Plain text
#: en/git-switch.txt:106
+#, priority:100
msgid "`--guess` is the default behavior. Use `--no-guess` to disable it."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:110
+#, priority:100
msgid "An alias for `--discard-changes`."
msgstr ""
#. type: Labeled list
#: en/git-switch.txt:111
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--discard-changes"
msgstr "--discard-changes"
#. type: Plain text
#: en/git-switch.txt:117
-msgid ""
-"Proceed even if the index or the working tree differs from `HEAD`. Both the "
-"index and working tree are restored to match the switching target. If "
-"`--recurse-submodules` is specified, submodule content is also restored to "
-"match the switching target. This is used to throw away local changes."
+#, priority:100
+msgid "Proceed even if the index or the working tree differs from `HEAD`. Both the index and working tree are restored to match the switching target. If `--recurse-submodules` is specified, submodule content is also restored to match the switching target. This is used to throw away local changes."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:127
-msgid ""
-"If you have local modifications to one or more files that are different "
-"between the current branch and the branch to which you are switching, the "
-"command refuses to switch branches in order to preserve your modifications "
-"in context. However, with this option, a three-way merge between the "
-"current branch, your working tree contents, and the new branch is done, and "
-"you will be on the new branch."
+#, priority:100
+msgid "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:156
-msgid ""
-"When creating a new branch, set up \"upstream\" configuration. `-c` is "
-"implied. See `--track` in linkgit:git-branch[1] for details."
+#, priority:100
+msgid "When creating a new branch, set up \"upstream\" configuration. `-c` is implied. See `--track` in linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:166
-msgid ""
-"If no `-c` option is given, the name of the new branch will be derived from "
-"the remote-tracking branch, by looking at the local part of the refspec "
-"configured for the corresponding remote, and then stripping the initial part "
-"up to the \"*\". This would tell us to use `hack` as the local branch when "
-"branching off of `origin/hack` (or `remotes/origin/hack`, or even "
-"`refs/remotes/origin/hack`). If the given name has no slash, or the above "
-"guessing results in an empty name, the guessing is aborted. You can "
-"explicitly give a name with `-c` in such a case."
+#, priority:100
+msgid "If no `-c` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-c` in such a case."
msgstr ""
#. type: Labeled list
#: en/git-switch.txt:171
-#, no-wrap
+#, no-wrap, priority:100
msgid "--orphan <new-branch>"
msgstr ""
#. type: Plain text
#: en/git-switch.txt:174
-msgid ""
-"Create a new 'orphan' branch, named `<new-branch>`. All tracked files are "
-"removed."
+#, priority:100
+msgid "Create a new 'orphan' branch, named `<new-branch>`. All tracked files are removed."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:180
-msgid ""
-"`git switch` refuses when the wanted ref is already checked out by another "
-"worktree. This option makes it check the ref out anyway. In other words, the "
-"ref can be held by more than one worktree."
+#, priority:100
+msgid "`git switch` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:189
-msgid ""
-"Using `--recurse-submodules` will update the content of all initialized "
-"submodules according to the commit recorded in the superproject. If nothing "
-"(or `--no-recurse-submodules`) is used, the work trees of submodules will "
-"not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` "
-"of the submodules."
+#, priority:100
+msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
msgstr ""
#. type: Plain text
#: en/git-switch.txt:194
+#, priority:100
msgid "The following command switches to the \"master\" branch:"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:197
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git switch master\n"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:204
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git switch mytopic\n"
msgstr ""
#. type: Plain text
#: en/git-switch.txt:209
-msgid ""
-"However, your \"wrong\" branch and correct \"mytopic\" branch may differ in "
-"files that you have modified locally, in which case the above switch would "
-"fail like this:"
+#, priority:100
+msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above switch would fail like this:"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:213
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git switch mytopic\n"
"error: You have local changes to 'frotz'; not switching branches.\n"
@@ -59645,7 +51054,7 @@ msgstr ""
#. type: delimited block -
#: en/git-switch.txt:221
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git switch -m mytopic\n"
"Auto-merging frotz\n"
@@ -59653,27 +51062,25 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:229
-msgid ""
-"To switch back to the previous branch before we switched to mytopic "
-"(i.e. \"master\" branch):"
+#, priority:100
+msgid "To switch back to the previous branch before we switched to mytopic (i.e. \"master\" branch):"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:232
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git switch -\n"
msgstr ""
#. type: Plain text
#: en/git-switch.txt:236
-msgid ""
-"You can grow a new branch from any commit. For example, switch to \"HEAD~3\" "
-"and create branch \"fixup\":"
+#, priority:100
+msgid "You can grow a new branch from any commit. For example, switch to \"HEAD~3\" and create branch \"fixup\":"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:240
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git switch -c fixup HEAD~3\n"
"Switched to a new branch 'fixup'\n"
@@ -59681,12 +51088,13 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:244
+#, priority:100
msgid "If you want to start a new branch from a remote branch of the same name:"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:249
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git switch new-topic\n"
"Branch 'new-topic' set up to track remote branch 'new-topic' from 'origin'\n"
@@ -59695,14 +51103,13 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:253
-msgid ""
-"To check out commit `HEAD~3` for temporary inspection or experiment without "
-"creating a new branch:"
+#, priority:100
+msgid "To check out commit `HEAD~3` for temporary inspection or experiment without creating a new branch:"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:257
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git switch --detach HEAD~3\n"
"HEAD is now at 9fc9555312 Merge branch 'cc/shared-index-permbits'\n"
@@ -59710,14 +51117,13 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:261
-msgid ""
-"If it turns out whatever you have done is worth keeping, you can always "
-"create a new name for it (without switching away):"
+#, priority:100
+msgid "If it turns out whatever you have done is worth keeping, you can always create a new name for it (without switching away):"
msgstr ""
#. type: delimited block -
#: en/git-switch.txt:264
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git switch -c good-surprises\n"
msgstr ""
@@ -59729,19 +51135,19 @@ msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-symbolic-ref(1)"
msgstr "git-symbolic-ref(1)"
#. type: Plain text
#: en/git-symbolic-ref.txt:7
+#, priority:100
msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git symbolic-ref' [-m <reason>] <name> <ref>\n"
"'git symbolic-ref' [-q] [--short] <name>\n"
@@ -59750,94 +51156,79 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:21
-msgid ""
-"Given one argument, reads which branch head the given symbolic ref refers to "
-"and outputs its path, relative to the `.git/` directory. Typically you "
-"would give `HEAD` as the <name> argument to see which branch your working "
-"tree is on."
+#, priority:100
+msgid "Given one argument, reads which branch head the given symbolic ref refers to and outputs its path, relative to the `.git/` directory. Typically you would give `HEAD` as the <name> argument to see which branch your working tree is on."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:24
-msgid ""
-"Given two arguments, creates or updates a symbolic ref <name> to point at "
-"the given branch <ref>."
+#, priority:100
+msgid "Given two arguments, creates or updates a symbolic ref <name> to point at the given branch <ref>."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:27
+#, priority:100
msgid "Given `--delete` and an additional argument, deletes the given symbolic ref."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:31
-msgid ""
-"A symbolic ref is a regular file that stores a string that begins with `ref: "
-"refs/`. For example, your `.git/HEAD` is a regular file whose contents is "
-"`ref: refs/heads/master`."
+#, priority:100
+msgid "A symbolic ref is a regular file that stores a string that begins with `ref: refs/`. For example, your `.git/HEAD` is a regular file whose contents is `ref: refs/heads/master`."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:38
+#, priority:100
msgid "Delete the symbolic ref <name>."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:44
-msgid ""
-"Do not issue an error message if the <name> is not a symbolic ref but a "
-"detached HEAD; instead exit with non-zero status silently."
+#, priority:100
+msgid "Do not issue an error message if the <name> is not a symbolic ref but a detached HEAD; instead exit with non-zero status silently."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:48
-msgid ""
-"When showing the value of <name> as a symbolic ref, try to shorten the "
-"value, e.g. from `refs/heads/master` to `master`."
+#, priority:100
+msgid "When showing the value of <name> as a symbolic ref, try to shorten the value, e.g. from `refs/heads/master` to `master`."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:52
-msgid ""
-"Update the reflog for <name> with <reason>. This is valid only when "
-"creating or updating a symbolic ref."
+#, priority:100
+msgid "Update the reflog for <name> with <reason>. This is valid only when creating or updating a symbolic ref."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:62
-msgid ""
-"In the past, `.git/HEAD` was a symbolic link pointing at "
-"`refs/heads/master`. When we wanted to switch to another branch, we did `ln "
-"-sf refs/heads/newbranch .git/HEAD`, and when we wanted to find out which "
-"branch we are on, we did `readlink .git/HEAD`. But symbolic links are not "
-"entirely portable, so they are now deprecated and symbolic refs (as "
-"described above) are used by default."
+#, priority:100
+msgid "In the past, `.git/HEAD` was a symbolic link pointing at `refs/heads/master`. When we wanted to switch to another branch, we did `ln -sf refs/heads/newbranch .git/HEAD`, and when we wanted to find out which branch we are on, we did `readlink .git/HEAD`. But symbolic links are not entirely portable, so they are now deprecated and symbolic refs (as described above) are used by default."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:66
-msgid ""
-"'git symbolic-ref' will exit with status 0 if the contents of the symbolic "
-"ref were printed correctly, with status 1 if the requested name is not a "
-"symbolic ref, or 128 if another error occurs."
+#, priority:100
+msgid "'git symbolic-ref' will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested name is not a symbolic ref, or 128 if another error occurs."
msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "git-tag(1)"
msgstr "git-tag(1)"
#. type: Plain text
#: en/git-tag.txt:7
-#, fuzzy
+#, fuzzy, priority:240
msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
#. type: Plain text
#: en/git-tag.txt:20
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] [-e]\n"
"\t<tagname> [<commit> | <object>]\n"
@@ -59851,333 +51242,277 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:26
-msgid ""
-"Add a tag reference in `refs/tags/`, unless `-d/-l/-v` is given to delete, "
-"list or verify tags."
+#, priority:240
+msgid "Add a tag reference in `refs/tags/`, unless `-d/-l/-v` is given to delete, list or verify tags."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:28
+#, priority:240
msgid "Unless `-f` is given, the named tag must not yet exist."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:33
-msgid ""
-"If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag' "
-"object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is "
-"given, an editor is started for the user to type in the tag message."
+#, priority:240
+msgid "If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag' object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is given, an editor is started for the user to type in the tag message."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:36
-msgid ""
-"If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <keyid>` are "
-"absent, `-a` is implied."
+#, priority:240
+msgid "If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <keyid>` are absent, `-a` is implied."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:39
-msgid ""
-"Otherwise, a tag reference that points directly at the given object (i.e., a "
-"lightweight tag) is created."
+#, priority:240
+msgid "Otherwise, a tag reference that points directly at the given object (i.e., a lightweight tag) is created."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:45
-msgid ""
-"A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is "
-"used. When `-u <keyid>` is not used, the committer identity for the current "
-"user is used to find the GnuPG key for signing. \tThe configuration variable "
-"`gpg.program` is used to specify custom GnuPG binary."
+#, priority:240
+msgid "A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is used. When `-u <keyid>` is not used, the committer identity for the current user is used to find the GnuPG key for signing. \tThe configuration variable `gpg.program` is used to specify custom GnuPG binary."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:51
-msgid ""
-"Tag objects (created with `-a`, `-s`, or `-u`) are called \"annotated\" "
-"tags; they contain a creation date, the tagger name and e-mail, a tagging "
-"message, and an optional GnuPG signature. Whereas a \"lightweight\" tag is "
-"simply a name for an object (usually a commit object)."
+#, priority:240
+msgid "Tag objects (created with `-a`, `-s`, or `-u`) are called \"annotated\" tags; they contain a creation date, the tagger name and e-mail, a tagging message, and an optional GnuPG signature. Whereas a \"lightweight\" tag is simply a name for an object (usually a commit object)."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:56
-msgid ""
-"Annotated tags are meant for release while lightweight tags are meant for "
-"private or temporary object labels. For this reason, some git commands for "
-"naming objects (like `git describe`) will ignore lightweight tags by "
-"default."
+#, priority:240
+msgid "Annotated tags are meant for release while lightweight tags are meant for private or temporary object labels. For this reason, some git commands for naming objects (like `git describe`) will ignore lightweight tags by default."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:63
+#, priority:240
msgid "Make an unsigned, annotated tag object"
msgstr ""
#. type: Labeled list
#: en/git-tag.txt:65
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--sign"
msgstr "--sign"
#. type: Plain text
#: en/git-tag.txt:70
-msgid ""
-"Make a GPG-signed tag, using the default e-mail address's key. The default "
-"behavior of tag GPG-signing is controlled by `tag.gpgSign` configuration "
-"variable if it exists, or disabled otherwise. See linkgit:git-config[1]."
+#, priority:240
+msgid "Make a GPG-signed tag, using the default e-mail address's key. The default behavior of tag GPG-signing is controlled by `tag.gpgSign` configuration variable if it exists, or disabled otherwise. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-tag.txt:71
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-sign"
msgstr "--no-sign"
#. type: Plain text
#: en/git-tag.txt:74
-msgid ""
-"Override `tag.gpgSign` configuration variable that is set to force each and "
-"every tag to be signed."
+#, priority:240
+msgid "Override `tag.gpgSign` configuration variable that is set to force each and every tag to be signed."
msgstr ""
#. type: Labeled list
#: en/git-tag.txt:75
-#, no-wrap
+#, no-wrap, priority:240
msgid "-u <keyid>"
msgstr ""
#. type: Labeled list
#: en/git-tag.txt:76
-#, no-wrap
+#, no-wrap, priority:240
msgid "--local-user=<keyid>"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:78
+#, priority:240
msgid "Make a GPG-signed tag, using the given key."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:82
+#, priority:240
msgid "Replace an existing tag with the given name (instead of failing)"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:86
+#, priority:240
msgid "Delete existing tags with the given names."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:90
+#, priority:240
msgid "Verify the GPG signature of the given tag names."
msgstr ""
#. type: Labeled list
#: en/git-tag.txt:91
-#, no-wrap
+#, no-wrap, priority:240
msgid "-n<num>"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:94
-msgid ""
-"<num> specifies how many lines from the annotation, if any, are printed when "
-"using -l. Implies `--list`."
+#, priority:240
+msgid "<num> specifies how many lines from the annotation, if any, are printed when using -l. Implies `--list`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:98
-msgid ""
-"The default is not to print any annotation lines. If no number is given to "
-"`-n`, only the first line is printed. If the tag is not annotated, the "
-"commit message is displayed instead."
+#, priority:240
+msgid "The default is not to print any annotation lines. If no number is given to `-n`, only the first line is printed. If the tag is not annotated, the commit message is displayed instead."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:103
-msgid ""
-"List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list "
-"only the tags that match the pattern(s)."
+#, ignore-ellipsis, priority:240
+msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:107
-msgid ""
-"Running \"git tag\" without arguments also lists all tags. The pattern is a "
-"shell wildcard (i.e., matched using fnmatch(3)). Multiple patterns may be "
-"given; if any of them matches, the tag is shown."
+#, priority:240
+msgid "Running \"git tag\" without arguments also lists all tags. The pattern is a shell wildcard (i.e., matched using fnmatch(3)). Multiple patterns may be given; if any of them matches, the tag is shown."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:111
-msgid ""
-"This option is implicitly supplied if any other list-like option such as "
-"`--contains` is provided. See the documentation for each of those options "
-"for details."
+#, priority:240
+msgid "This option is implicitly supplied if any other list-like option such as `--contains` is provided. See the documentation for each of those options for details."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:124
-msgid ""
-"Sort based on the key given. Prefix `-` to sort in descending order of the "
-"value. You may use the --sort=<key> option multiple times, in which case the "
-"last key becomes the primary key. Also supports \"version:refname\" or "
-"\"v:refname\" (tag names are treated as versions). The \"version:refname\" "
-"sort order can also be affected by the \"versionsort.suffix\" configuration "
-"variable. The keys supported are the same as those in `git for-each-ref`. "
-"Sort order defaults to the value configured for the `tag.sort` variable if "
-"it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
+#, priority:240
+msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. Also supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:133
-#, fuzzy
+#, fuzzy, priority:240
msgid "Sorting and filtering tags are case insensitive."
msgstr "ordenamiento y filtrado son case-insensitive"
#. type: Plain text
#: en/git-tag.txt:139
-msgid ""
-"Display tag listing in columns. See configuration variable column.tag for "
-"option syntax.`--column` and `--no-column` without options are equivalent to "
-"'always' and 'never' respectively."
+#, priority:240
+msgid "Display tag listing in columns. See configuration variable column.tag for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:141
+#, priority:240
msgid "This option is only applicable when listing tags without annotation lines."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:145
-msgid ""
-"Only list tags which contain the specified commit (HEAD if not "
-"specified). Implies `--list`."
+#, priority:240
+msgid "Only list tags which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:149
-msgid ""
-"Only list tags which don't contain the specified commit (HEAD if not "
-"specified). Implies `--list`."
+#, priority:240
+msgid "Only list tags which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:153
-msgid ""
-"Only list tags whose commits are reachable from the specified commit (`HEAD` "
-"if not specified), incompatible with `--no-merged`."
+#, priority:240
+msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified), incompatible with `--no-merged`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:157
-msgid ""
-"Only list tags whose commits are not reachable from the specified commit "
-"(`HEAD` if not specified), incompatible with `--merged`."
+#, priority:240
+msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified), incompatible with `--merged`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:161
-msgid ""
-"Only list tags of the given object (HEAD if not specified). Implies "
-"`--list`."
+#, priority:240
+msgid "Only list tags of the given object (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:169
-msgid ""
-"Use the given tag message (instead of prompting). If multiple `-m` options "
-"are given, their values are concatenated as separate paragraphs. Implies "
-"`-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
+#, priority:240
+msgid "Use the given tag message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:176
-msgid ""
-"Take the tag message from the given file. Use '-' to read the message from "
-"the standard input. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is "
-"given."
+#, priority:240
+msgid "Take the tag message from the given file. Use '-' to read the message from the standard input. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:182
-msgid ""
-"The message taken from file with `-F` and command line with `-m` are usually "
-"used as the tag message unmodified. This option lets you further edit the "
-"message taken from these sources."
+#, priority:240
+msgid "The message taken from file with `-F` and command line with `-m` are usually used as the tag message unmodified. This option lets you further edit the message taken from these sources."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:189
-msgid ""
-"This option sets how the tag message is cleaned up. The '<mode>' can be one "
-"of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The "
-"'verbatim' mode does not change message at all, 'whitespace' removes just "
-"leading/trailing whitespace lines and 'strip' removes both whitespace and "
-"commentary."
+#, priority:240
+msgid "This option sets how the tag message is cleaned up. The '<mode>' can be one of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The 'verbatim' mode does not change message at all, 'whitespace' removes just leading/trailing whitespace lines and 'strip' removes both whitespace and commentary."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:196
-msgid ""
-"Create a reflog for the tag. To globally enable reflogs for tags, see "
-"`core.logAllRefUpdates` in linkgit:git-config[1]. The negated form "
-"`--no-create-reflog` only overrides an earlier `--create-reflog`, but "
-"currently does not negate the setting of `core.logAllRefUpdates`."
+#, priority:240
+msgid "Create a reflog for the tag. To globally enable reflogs for tags, see `core.logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:202
-msgid ""
-"A string that interpolates `%(fieldname)` from a tag ref being shown and the "
-"object it points at. The format is the same as that of "
-"linkgit:git-for-each-ref[1]. When unspecified, defaults to "
-"`%(refname:strip=2)`."
+#, priority:240
+msgid "A string that interpolates `%(fieldname)` from a tag ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]. When unspecified, defaults to `%(refname:strip=2)`."
msgstr ""
#. type: Labeled list
#: en/git-tag.txt:203
-#, no-wrap
+#, no-wrap, priority:240
msgid "<tagname>"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:208
-msgid ""
-"The name of the tag to create, delete, or describe. The new tag name must "
-"pass all checks defined by linkgit:git-check-ref-format[1]. Some of these "
-"checks may restrict the characters allowed in a tag name."
+#, priority:240
+msgid "The name of the tag to create, delete, or describe. The new tag name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a tag name."
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
-#, fuzzy, no-wrap
+#: en/git-tag.txt:209 en/git.txt:348
+#, fuzzy, no-wrap, priority:240
msgid "<commit>"
msgstr "`commit`"
#. type: Plain text
#: en/git-tag.txt:213
-msgid ""
-"The object that the new tag will refer to, usually a commit. Defaults to "
-"HEAD."
+#, priority:240
+msgid "The object that the new tag will refer to, usually a commit. Defaults to HEAD."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:220
-msgid ""
-"By default, 'git tag' in sign-with-default mode (-s) will use your committer "
-"identity (of the form `Your Name <your@email.address>`) to find a key. If "
-"you want to use a different default key, you can specify it in the "
-"repository configuration as follows:"
+#, priority:240
+msgid "By default, 'git tag' in sign-with-default mode (-s) will use your committer identity (of the form `Your Name <your@email.address>`) to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows:"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:224
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"[user]\n"
" signingKey = <gpg-keyid>\n"
@@ -60185,75 +51520,61 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:229
-msgid ""
-"`pager.tag` is only respected when listing tags, i.e., when `-l` is used or "
-"implied. The default is to use a pager. See linkgit:git-config[1]."
+#, priority:240
+msgid "`pager.tag` is only respected when listing tags, i.e., when `-l` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
#. type: Title ~
#: en/git-tag.txt:234
-#, no-wrap
+#, no-wrap, priority:240
msgid "On Re-tagging"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:238
+#, priority:240
msgid "What should you do when you tag a wrong commit and you would want to re-tag?"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:241
-msgid ""
-"If you never pushed anything out, just re-tag it. Use \"-f\" to replace the "
-"old one. And you're done."
+#, priority:240
+msgid "If you never pushed anything out, just re-tag it. Use \"-f\" to replace the old one. And you're done."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:245
-msgid ""
-"But if you have pushed things out (or others could just read your repository "
-"directly), then others will have already seen the old tag. In that case you "
-"can do one of two things:"
+#, priority:240
+msgid "But if you have pushed things out (or others could just read your repository directly), then others will have already seen the old tag. In that case you can do one of two things:"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:252
-msgid ""
-"The sane thing. Just admit you screwed up, and use a different name. Others "
-"have already seen one tag-name, and if you keep the same name, you may be in "
-"the situation that two people both have \"version X\", but they actually "
-"have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
+#, priority:240
+msgid "The sane thing. Just admit you screwed up, and use a different name. Others have already seen one tag-name, and if you keep the same name, you may be in the situation that two people both have \"version X\", but they actually have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:257
-msgid ""
-"The insane thing. You really want to call the new version \"X\" too, 'even "
-"though' others have already seen the old one. So just use 'git tag -f' "
-"again, as if you hadn't already published the old one."
+#, priority:240
+msgid "The insane thing. You really want to call the new version \"X\" too, 'even though' others have already seen the old one. So just use 'git tag -f' again, as if you hadn't already published the old one."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:262
-msgid ""
-"However, Git does *not* (and it should not) change tags behind users "
-"back. So if somebody already got the old tag, doing a 'git pull' on your "
-"tree shouldn't just make them overwrite the old one."
+#, priority:240
+msgid "However, Git does *not* (and it should not) change tags behind users back. So if somebody already got the old tag, doing a 'git pull' on your tree shouldn't just make them overwrite the old one."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:269
-msgid ""
-"If somebody got a release tag from you, you cannot just change the tag for "
-"them by updating your own one. This is a big security issue, in that people "
-"MUST be able to trust their tag-names. If you really want to do the insane "
-"thing, you need to just fess up to it, and tell people that you messed "
-"up. You can do that by making a very public announcement saying:"
+#, priority:240
+msgid "If somebody got a release tag from you, you cannot just change the tag for them by updating your own one. This is a big security issue, in that people MUST be able to trust their tag-names. If you really want to do the insane thing, you need to just fess up to it, and tell people that you messed up. You can do that by making a very public announcement saying:"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:273
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"Ok, I messed up, and I pushed out an earlier version tagged as X. I\n"
"then fixed something, and retagged the *fixed* tree as X again.\n"
@@ -60261,7 +51582,7 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:276
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"If you got the wrong tag, and want the new one, please delete\n"
"the old one and fetch the new one by doing:\n"
@@ -60269,7 +51590,7 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:279
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"\tgit tag -d X\n"
"\tgit fetch origin tag X\n"
@@ -60277,192 +51598,163 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:281
-#, no-wrap
+#, no-wrap, priority:240
msgid "to get my updated tag.\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:283
-#, no-wrap
+#, no-wrap, priority:240
msgid "You can test which tag you have by doing\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:285
-#, no-wrap
+#, no-wrap, priority:240
msgid "\tgit rev-parse X\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:287
-#, no-wrap
+#, no-wrap, priority:240
msgid "which should return 0123456789abcdef.. if you have the new version.\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:289
-#, no-wrap
+#, no-wrap, priority:240
msgid "Sorry for the inconvenience.\n"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:294
-msgid ""
-"Does this seem a bit complicated? It *should* be. There is no way that it "
-"would be correct to just \"fix\" it automatically. People need to know that "
-"their tags might have been changed."
+#, priority:240
+msgid "Does this seem a bit complicated? It *should* be. There is no way that it would be correct to just \"fix\" it automatically. People need to know that their tags might have been changed."
msgstr ""
#. type: Title ~
#: en/git-tag.txt:297
-#, no-wrap
+#, no-wrap, priority:240
msgid "On Automatic following"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:302
-msgid ""
-"If you are following somebody else's tree, you are most likely using "
-"remote-tracking branches (eg. `refs/remotes/origin/master`). You usually "
-"want the tags from the other end."
+#, priority:240
+msgid "If you are following somebody else's tree, you are most likely using remote-tracking branches (eg. `refs/remotes/origin/master`). You usually want the tags from the other end."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:309
-msgid ""
-"On the other hand, if you are fetching because you would want a one-shot "
-"merge from somebody else, you typically do not want to get tags from there. "
-"This happens more often for people near the toplevel but not limited to "
-"them. Mere mortals when pulling from each other do not necessarily want to "
-"automatically get private anchor point tags from the other person."
+#, priority:240
+msgid "On the other hand, if you are fetching because you would want a one-shot merge from somebody else, you typically do not want to get tags from there. This happens more often for people near the toplevel but not limited to them. Mere mortals when pulling from each other do not necessarily want to automatically get private anchor point tags from the other person."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:314
-msgid ""
-"Often, \"please pull\" messages on the mailing list just provide two pieces "
-"of information: a repo URL and a branch name; this is designed to be easily "
-"cut&pasted at the end of a 'git fetch' command line:"
+#, priority:240
+msgid "Often, \"please pull\" messages on the mailing list just provide two pieces of information: a repo URL and a branch name; this is designed to be easily cut&pasted at the end of a 'git fetch' command line:"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:317
-#, no-wrap
+#, no-wrap, priority:240
msgid "Linus, please pull from\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:319
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid "\tgit://git..../proj.git master\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:321
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid "to get the following updates...\n"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:324
+#, priority:240
msgid "becomes:"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:327
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid "$ git pull git://git..../proj.git master\n"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:331
-msgid ""
-"In such a case, you do not want to automatically follow the other person's "
-"tags."
+#, priority:240
+msgid "In such a case, you do not want to automatically follow the other person's tags."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:339
-msgid ""
-"One important aspect of Git is its distributed nature, which largely means "
-"there is no inherent \"upstream\" or \"downstream\" in the system. On the "
-"face of it, the above example might seem to indicate that the tag namespace "
-"is owned by the upper echelon of people and that tags only flow downwards, "
-"but that is not the case. It only shows that the usage pattern determines "
-"who are interested in whose tags."
+#, priority:240
+msgid "One important aspect of Git is its distributed nature, which largely means there is no inherent \"upstream\" or \"downstream\" in the system. On the face of it, the above example might seem to indicate that the tag namespace is owned by the upper echelon of people and that tags only flow downwards, but that is not the case. It only shows that the usage pattern determines who are interested in whose tags."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:351
-msgid ""
-"A one-shot pull is a sign that a commit history is now crossing the boundary "
-"between one circle of people (e.g. \"people who are primarily interested in "
-"the networking part of the kernel\") who may have their own set of tags "
-"(e.g. \"this is the third release candidate from the networking group to be "
-"proposed for general consumption with 2.6.21 release\") to another circle of "
-"people (e.g. \"people who integrate various subsystem improvements\"). The "
-"latter are usually not interested in the detailed tags used internally in "
-"the former group (that is what \"internal\" means). That is why it is "
-"desirable not to follow tags automatically in this case."
+#, priority:240
+msgid "A one-shot pull is a sign that a commit history is now crossing the boundary between one circle of people (e.g. \"people who are primarily interested in the networking part of the kernel\") who may have their own set of tags (e.g. \"this is the third release candidate from the networking group to be proposed for general consumption with 2.6.21 release\") to another circle of people (e.g. \"people who integrate various subsystem improvements\"). The latter are usually not interested in the detailed tags used internally in the former group (that is what \"internal\" means). That is why it is desirable not to follow tags automatically in this case."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:357
-msgid ""
-"It may well be that among networking people, they may want to exchange the "
-"tags internal to their group, but in that workflow they are most likely "
-"tracking each other's progress by having remote-tracking branches. Again, "
-"the heuristic to automatically follow such tags is a good thing."
+#, priority:240
+msgid "It may well be that among networking people, they may want to exchange the tags internal to their group, but in that workflow they are most likely tracking each other's progress by having remote-tracking branches. Again, the heuristic to automatically follow such tags is a good thing."
msgstr ""
#. type: Title ~
#: en/git-tag.txt:360
-#, no-wrap
+#, no-wrap, priority:240
msgid "On Backdating Tags"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:367
-msgid ""
-"If you have imported some changes from another VCS and would like to add "
-"tags for major releases of your work, it is useful to be able to specify the "
-"date to embed inside of the tag object; such data in the tag object affects, "
-"for example, the ordering of tags in the gitweb interface."
+#, priority:240
+msgid "If you have imported some changes from another VCS and would like to add tags for major releases of your work, it is useful to be able to specify the date to embed inside of the tag object; such data in the tag object affects, for example, the ordering of tags in the gitweb interface."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:371
-msgid ""
-"To set the date used in future tag objects, set the environment variable "
-"GIT_COMMITTER_DATE (see the later discussion of possible values; the most "
-"common form is \"YYYY-MM-DD HH:MM\")."
+#, priority:240
+msgid "To set the date used in future tag objects, set the environment variable GIT_COMMITTER_DATE (see the later discussion of possible values; the most common form is \"YYYY-MM-DD HH:MM\")."
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:376
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:384
+#, priority:240
msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]."
msgstr ""
#. type: Title =
#: en/git.txt:2
-#, no-wrap
+#, no-wrap, priority:100
msgid "git(1)"
msgstr ""
#. type: Plain text
#: en/git.txt:7
+#, priority:100
msgid "git - the stupid content tracker"
msgstr ""
#. type: Plain text
#: en/git.txt:18
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid ""
"'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
@@ -60473,94 +51765,73 @@ msgid ""
msgstr ""
"git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n"
" [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] "
-"[--bare]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
" <comando> [<args>]"
#. type: Plain text
#: en/git.txt:24
-msgid ""
-"Git is a fast, scalable, distributed revision control system with an "
-"unusually rich command set that provides both high-level operations and full "
-"access to internals."
+#, priority:100
+msgid "Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals."
msgstr ""
#. type: Plain text
#: en/git.txt:29
-msgid ""
-"See linkgit:gittutorial[7] to get started, then see linkgit:giteveryday[7] "
-"for a useful minimum set of commands. The link:user-manual.html[Git User's "
-"Manual] has a more in-depth introduction."
+#, priority:100
+msgid "See linkgit:gittutorial[7] to get started, then see linkgit:giteveryday[7] for a useful minimum set of commands. The link:user-manual.html[Git User's Manual] has a more in-depth introduction."
msgstr ""
#. type: Plain text
#: en/git.txt:34
-msgid ""
-"After you mastered the basic concepts, you can come back to this page to "
-"learn what commands Git offers. You can learn more about individual Git "
-"commands with \"git help command\". linkgit:gitcli[7] manual page gives you "
-"an overview of the command-line command syntax."
+#, priority:100
+msgid "After you mastered the basic concepts, you can come back to this page to learn what commands Git offers. You can learn more about individual Git commands with \"git help command\". linkgit:gitcli[7] manual page gives you an overview of the command-line command syntax."
msgstr ""
#. type: Plain text
#: en/git.txt:38
-msgid ""
-"A formatted and hyperlinked copy of the latest Git documentation can be "
-"viewed at https://git.github.io/htmldocs/git.html or "
-"https://git-scm.com/docs."
+#, priority:100
+msgid "A formatted and hyperlinked copy of the latest Git documentation can be viewed at https://git.github.io/htmldocs/git.html or https://git-scm.com/docs."
msgstr ""
#. type: Plain text
#: en/git.txt:44
+#, priority:100
msgid "Prints the Git suite version that the 'git' program came from."
msgstr ""
#. type: Plain text
#: en/git.txt:50
-msgid ""
-"Prints the synopsis and a list of the most commonly used commands. If the "
-"option `--all` or `-a` is given then all available commands are printed. If "
-"a Git command is named this option will bring up the manual page for that "
-"command."
+#, priority:100
+msgid "Prints the synopsis and a list of the most commonly used commands. If the option `--all` or `-a` is given then all available commands are printed. If a Git command is named this option will bring up the manual page for that command."
msgstr ""
#. type: Plain text
#: en/git.txt:55
-msgid ""
-"Other options are available to control how the manual page is displayed. See "
-"linkgit:git-help[1] for more information, because `git --help ...` is "
-"converted internally into `git help ...`."
+#, ignore-ellipsis, priority:100
+msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
msgstr ""
#. type: Labeled list
#: en/git.txt:56
-#, no-wrap
+#, no-wrap, priority:100
msgid "-C <path>"
msgstr ""
#. type: Plain text
#: en/git.txt:62
-msgid ""
-"Run as if git was started in '<path>' instead of the current working "
-"directory. When multiple `-C` options are given, each subsequent "
-"non-absolute `-C <path>` is interpreted relative to the preceding `-C "
-"<path>`. If '<path>' is present but empty, e.g. `-C \"\"`, then the current "
-"working directory is left unchanged."
+#, priority:100
+msgid "Run as if git was started in '<path>' instead of the current working directory. When multiple `-C` options are given, each subsequent non-absolute `-C <path>` is interpreted relative to the preceding `-C <path>`. If '<path>' is present but empty, e.g. `-C \"\"`, then the current working directory is left unchanged."
msgstr ""
#. type: Plain text
#: en/git.txt:67
-msgid ""
-"This option affects options that expect path name like `--git-dir` and "
-"`--work-tree` in that their interpretations of the path names would be made "
-"relative to the working directory caused by the `-C` option. For example the "
-"following invocations are equivalent:"
+#, priority:100
+msgid "This option affects options that expect path name like `--git-dir` and `--work-tree` in that their interpretations of the path names would be made relative to the working directory caused by the `-C` option. For example the following invocations are equivalent:"
msgstr ""
#. type: Plain text
#: en/git.txt:70
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" git --git-dir=a.git --work-tree=b -C c status\n"
" git --git-dir=c/a.git --work-tree=c/b status\n"
@@ -60568,480 +51839,421 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:71
-#, no-wrap
+#, no-wrap, priority:100
msgid "-c <name>=<value>"
msgstr ""
#. type: Plain text
#: en/git.txt:76
-msgid ""
-"Pass a configuration parameter to the command. The value given will override "
-"values from configuration files. The <name> is expected in the same format "
-"as listed by 'git config' (subkeys separated by dots)."
+#, priority:100
+msgid "Pass a configuration parameter to the command. The value given will override values from configuration files. The <name> is expected in the same format as listed by 'git config' (subkeys separated by dots)."
msgstr ""
#. type: Plain text
#: en/git.txt:82
-msgid ""
-"Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets "
-"`foo.bar` to the boolean true value (just like `[foo]bar` would in a config "
-"file). Including the equals but with an empty value (like `git -c foo.bar= "
-"...`) sets `foo.bar` to the empty string which `git config --type=bool` will "
-"convert to `false`."
+#, ignore-ellipsis, priority:100
+msgid "Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c foo.bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` will convert to `false`."
msgstr ""
#. type: Labeled list
#: en/git.txt:83
-#, no-wrap
+#, no-wrap, priority:100
msgid "--exec-path[=<path>]"
msgstr ""
#. type: Plain text
#: en/git.txt:88
-msgid ""
-"Path to wherever your core Git programs are installed. This can also be "
-"controlled by setting the GIT_EXEC_PATH environment variable. If no path is "
-"given, 'git' will print the current setting and then exit."
+#, priority:100
+msgid "Path to wherever your core Git programs are installed. This can also be controlled by setting the GIT_EXEC_PATH environment variable. If no path is given, 'git' will print the current setting and then exit."
msgstr ""
#. type: Labeled list
#: en/git.txt:89
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--html-path"
msgstr "--html-path"
#. type: Plain text
#: en/git.txt:92
-msgid ""
-"Print the path, without trailing slash, where Git's HTML documentation is "
-"installed and exit."
+#, priority:100
+msgid "Print the path, without trailing slash, where Git's HTML documentation is installed and exit."
msgstr ""
#. type: Labeled list
#: en/git.txt:93
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--man-path"
msgstr "--man-path"
#. type: Plain text
#: en/git.txt:96
-msgid ""
-"Print the manpath (see `man(1)`) for the man pages for this version of Git "
-"and exit."
+#, priority:100
+msgid "Print the manpath (see `man(1)`) for the man pages for this version of Git and exit."
msgstr ""
#. type: Labeled list
#: en/git.txt:97
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--info-path"
msgstr "--info-path"
#. type: Plain text
#: en/git.txt:100
-msgid ""
-"Print the path where the Info files documenting this version of Git are "
-"installed and exit."
+#, priority:100
+msgid "Print the path where the Info files documenting this version of Git are installed and exit."
msgstr ""
#. type: Labeled list
#: en/git.txt:102
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--paginate"
msgstr "--paginate"
#. type: Plain text
#: en/git.txt:107
-msgid ""
-"Pipe all output into 'less' (or if set, $PAGER) if standard output is a "
-"terminal. This overrides the `pager.<cmd>` configuration options (see the "
-"\"Configuration Mechanism\" section below)."
+#, priority:100
+msgid "Pipe all output into 'less' (or if set, $PAGER) if standard output is a terminal. This overrides the `pager.<cmd>` configuration options (see the \"Configuration Mechanism\" section below)."
msgstr ""
#. type: Labeled list
#: en/git.txt:109
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-pager"
msgstr "--no-pager"
#. type: Plain text
#: en/git.txt:111
+#, priority:100
msgid "Do not pipe Git output into a pager."
msgstr ""
#. type: Labeled list
#: en/git.txt:112
-#, no-wrap
+#, no-wrap, priority:100
msgid "--git-dir=<path>"
msgstr ""
#. type: Plain text
#: en/git.txt:116
-msgid ""
-"Set the path to the repository. This can also be controlled by setting the "
-"`GIT_DIR` environment variable. It can be an absolute path or relative path "
-"to current working directory."
+#, priority:100
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
-#, no-wrap
+#: en/git.txt:131
+#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
-msgid ""
-"Set the path to the working tree. It can be an absolute path or a path "
-"relative to the current working directory. This can also be controlled by "
-"setting the GIT_WORK_TREE environment variable and the core.worktree "
-"configuration variable (see core.worktree in linkgit:git-config[1] for a "
-"more detailed discussion)."
+#: en/git.txt:138
+#, priority:100
+msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
-#, no-wrap
+#: en/git.txt:139
+#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
-msgid ""
-"Set the Git namespace. See linkgit:gitnamespaces[7] for more details. "
-"Equivalent to setting the `GIT_NAMESPACE` environment variable."
+#: en/git.txt:143
+#, priority:100
+msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
-#, no-wrap
+#: en/git.txt:144
+#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
-msgid ""
-"Currently for internal use only. Set a prefix which gives a path from above "
-"a repository down to its root. One use is to give submodules context about "
-"the superproject that invoked it."
+#: en/git.txt:148
+#, priority:100
+msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
-msgid ""
-"Treat the repository as a bare repository. If GIT_DIR environment is not "
-"set, it is set to the current working directory."
+#: en/git.txt:153
+#, priority:100
+msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
-#, no-wrap
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
-msgid ""
-"Do not use replacement refs to replace Git objects. See "
-"linkgit:git-replace[1] for more information."
+#: en/git.txt:157
+#, priority:100
+msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
-#, no-wrap
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
-msgid ""
-"Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is "
-"equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to "
-"`1`."
+#: en/git.txt:162
+#, priority:100
+msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
-#, no-wrap
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
-msgid ""
-"Add \"glob\" magic to all pathspec. This is equivalent to setting the "
-"`GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on "
-"individual pathspecs can be done using pathspec magic \":(literal)\""
+#: en/git.txt:168
+#, priority:100
+msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
-#, no-wrap
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
-msgid ""
-"Add \"literal\" magic to all pathspec. This is equivalent to setting the "
-"`GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on "
-"individual pathspecs can be done using pathspec magic \":(glob)\""
+#: en/git.txt:174
+#, priority:100
+msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
-#, no-wrap
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
-msgid ""
-"Add \"icase\" magic to all pathspec. This is equivalent to setting the "
-"`GIT_ICASE_PATHSPECS` environment variable to `1`."
+#: en/git.txt:178
+#, priority:100
+msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
-#, no-wrap
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
-msgid ""
-"Do not perform optional operations that require locks. This is equivalent to "
-"setting the `GIT_OPTIONAL_LOCKS` to `0`."
+#: en/git.txt:182
+#, priority:100
+msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
-#, no-wrap
+#: en/git.txt:183
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
-msgid ""
-"List commands by group. This is an internal/experimental option and may "
-"change or be removed in the future. Supported groups are: builtins, parseopt "
-"(builtin commands that use parse-options), main (all commands in libexec "
-"directory), others (all other commands in `$PATH` that have git- prefix), "
-"list-<category> (see categories in command-list.txt), nohelpers (exclude "
-"helper commands), alias and config (retrieve command list from config "
-"variable completion.commands)"
+#: en/git.txt:192
+#, priority:100
+msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
-#, no-wrap
+#: en/git.txt:194
+#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
-msgid ""
-"We divide Git into high level (\"porcelain\") commands and low level "
-"(\"plumbing\") commands."
+#: en/git.txt:198
+#, priority:100
+msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
-#, no-wrap
+#: en/git.txt:200
+#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
-msgid ""
-"We separate the porcelain commands into the main commands and some ancillary "
-"user utilities."
+#: en/git.txt:204
+#, priority:100
+msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
-#, fuzzy, no-wrap
+#: en/git.txt:206
+#, fuzzy, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr "Comandos de Porcelana principales"
#. type: Title ~
-#: en/git.txt:197
-#, no-wrap
+#: en/git.txt:211
+#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
+#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
+#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
-#, no-wrap
+#: en/git.txt:222
+#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr "Interactuando con Otros"
#. type: Plain text
-#: en/git.txt:212
-msgid ""
-"These commands are to interact with foreign SCM and with other people via "
-"patch over e-mail."
+#: en/git.txt:226
+#, priority:100
+msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
-#, no-wrap
+#: en/git.txt:230
+#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
-msgid ""
-"There are three commands with similar names: `git reset`, `git restore` and "
-"`git revert`."
+#: en/git.txt:233
+#, priority:100
+msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
-msgid ""
-"linkgit:git-revert[1] is about making a new commit that reverts the changes "
-"made by other commits."
+#: en/git.txt:236
+#, priority:100
+msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
-msgid ""
-"linkgit:git-restore[1] is about restoring files in the working tree from "
-"either the index or another commit. This command does not update your "
-"branch. The command can also be used to restore files in the index from "
-"another commit."
+#: en/git.txt:241
+#, priority:100
+msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
-msgid ""
-"linkgit:git-reset[1] is about updating your branch, moving the tip in order "
-"to add or remove commits from the branch. This operation changes the commit "
-"history."
+#: en/git.txt:245
+#, priority:100
+msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
-msgid ""
-"`git reset` can also be used to restore the index, overlapping with `git "
-"restore`."
+#: en/git.txt:248
+#, priority:100
+msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
-#, no-wrap
+#: en/git.txt:251
+#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
-msgid ""
-"Although Git includes its own porcelain layer, its low-level commands are "
-"sufficient to support development of alternative porcelains. Developers of "
-"such porcelains might start by reading about linkgit:git-update-index[1] and "
-"linkgit:git-read-tree[1]."
+#: en/git.txt:258
+#, priority:100
+msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
-msgid ""
-"The interface (input, output, set of options and the semantics) to these "
-"low-level commands are meant to be a lot more stable than Porcelain level "
-"commands, because these commands are primarily for scripted use. The "
-"interface to Porcelain commands on the other hand are subject to change in "
-"order to improve the end user experience."
+#: en/git.txt:265
+#, priority:100
+msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
-msgid ""
-"The following description divides the low-level commands into commands that "
-"manipulate objects (in the repository, index, and working tree), commands "
-"that interrogate and compare objects, and commands that move objects and "
-"references between repositories."
+#: en/git.txt:271
+#, priority:100
+msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
-#, no-wrap
+#: en/git.txt:274
+#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
-#, no-wrap
+#: en/git.txt:280
+#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
-msgid ""
-"In general, the interrogate commands do not touch the files in the working "
-"tree."
+#: en/git.txt:286
+#, priority:100
+msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
-#, no-wrap
+#: en/git.txt:289
+#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
-msgid ""
-"The following are helper commands used by the above; end users typically do "
-"not use them directly."
+#: en/git.txt:295
+#, priority:100
+msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
-#, no-wrap
+#: en/git.txt:300
+#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
-msgid ""
-"These are internal helper commands used by other commands; end users "
-"typically do not use them directly."
+#: en/git.txt:304
+#, priority:100
+msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
-#, no-wrap
+#: en/git.txt:309
+#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
-msgid ""
-"Git uses a simple text format to store customizations that are per "
-"repository and are per user. Such a configuration file may look like this:"
+#: en/git.txt:314
+#, priority:100
+msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
-#, no-wrap
+#: en/git.txt:319
+#, no-wrap, priority:100
msgid ""
"#\n"
"# A '#' or ';' character indicates a comment.\n"
@@ -61049,8 +52261,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
-#, no-wrap
+#: en/git.txt:329
+#, no-wrap, priority:100
msgid ""
"; user identity\n"
"[user]\n"
@@ -61059,721 +52271,650 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
-msgid ""
-"Various commands read from the configuration file and adjust their operation "
-"accordingly. See linkgit:git-config[1] for a list and more details about "
-"the configuration mechanism."
+#: en/git.txt:335
+#, priority:100
+msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
-#, no-wrap
+#: en/git.txt:338
+#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
+#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
-#, no-wrap
+#: en/git.txt:342 en/git-unpack-file.txt:23
+#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
+#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
+#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
+#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
-msgid ""
-"Indicates a tree, commit or tag object name. A command that takes a "
-"<tree-ish> argument ultimately wants to operate on a <tree> object but "
-"automatically dereferences <commit> and <tag> objects that point at a "
-"<tree>."
+#: en/git.txt:356
+#, priority:100
+msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
-#, no-wrap
+#: en/git.txt:357
+#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
-msgid ""
-"Indicates a commit or tag object name. A command that takes a <commit-ish> "
-"argument ultimately wants to operate on a <commit> object but automatically "
-"dereferences <tag> objects that point at a <commit>."
+#: en/git.txt:362
+#, priority:100
+msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
-msgid ""
-"Indicates that an object type is required. Currently one of: `blob`, "
-"`tree`, `commit`, or `tag`."
+#: en/git.txt:366
+#, priority:100
+msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
-msgid ""
-"Indicates a filename - almost always relative to the root of the tree "
-"structure `GIT_INDEX_FILE` describes."
+#: en/git.txt:370
+#, priority:100
+msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
-#, no-wrap
+#: en/git.txt:372
+#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
-msgid ""
-"Any Git command accepting any <object> can also use the following symbolic "
-"notation:"
+#: en/git.txt:375
+#, priority:100
+msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
+#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
-#, no-wrap
+#: en/git.txt:379
+#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
+#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
+#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
-msgid ""
-"For a more complete list of ways to spell object names, see \"SPECIFYING "
-"REVISIONS\" section in linkgit:gitrevisions[7]."
+#: en/git.txt:389
+#, priority:100
+msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
-#, no-wrap
+#: en/git.txt:392
+#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
+#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
+#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
-msgid ""
-"Higher level SCMs may provide and manage additional information in the "
-"`$GIT_DIR`."
+#: en/git.txt:400
+#, priority:100
+msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
-#, no-wrap
+#: en/git.txt:403
+#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
+#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
+#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
-#, no-wrap
+#: en/git.txt:412
+#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
-msgid ""
-"These environment variables apply to 'all' core Git commands. Nb: it is "
-"worth noting that they may be used/overridden by SCMS sitting above Git so "
-"take care if using a foreign front-end."
+#: en/git.txt:416
+#, priority:100
+msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
-#, no-wrap
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
-msgid ""
-"This environment allows the specification of an alternate index file. If not "
-"specified, the default of `$GIT_DIR/index` is used."
+#: en/git.txt:421
+#, priority:100
+msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
-#, no-wrap
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
-msgid ""
-"This environment variable allows the specification of an index version for "
-"new repositories. It won't affect existing index files. By default index "
-"file version 2 or 3 is used. See linkgit:git-update-index[1] for more "
-"information."
+#: en/git.txt:427
+#, priority:100
+msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
-#, no-wrap
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
-msgid ""
-"If the object storage directory is specified via this environment variable "
-"then the sha1 directories are created underneath - otherwise the default "
-"`$GIT_DIR/objects` directory is used."
+#: en/git.txt:433
+#, priority:100
+msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
-#, no-wrap
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
-msgid ""
-"Due to the immutable nature of Git objects, old objects can be archived into "
-"shared, read-only directories. This variable specifies a \":\" separated (on "
-"Windows \";\" separated) list of Git object directories which can be used to "
-"search for Git objects. New objects will not be written to these "
-"directories."
+#: en/git.txt:440
+#, priority:100
+msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
-msgid ""
-"Entries that begin with `\"` (double-quote) will be interpreted as C-style "
-"quoted paths, removing leading and trailing double-quotes and respecting "
-"backslash escapes. E.g., the value "
-"`\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: "
-"`path-with-\"-and-:-in-it` and `vanilla-path`."
+#: en/git.txt:446
+#, priority:100
+msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
-#, no-wrap
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
-msgid ""
-"If the `GIT_DIR` environment variable is set then it specifies a path to use "
-"instead of the default `.git` for the base of the repository. The "
-"`--git-dir` command-line option also sets this value."
+#: en/git.txt:452
+#, priority:100
+msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
-#, no-wrap
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
-msgid ""
-"Set the path to the root of the working tree. This can also be controlled "
-"by the `--work-tree` command-line option and the core.worktree configuration "
-"variable."
+#: en/git.txt:457
+#, priority:100
+msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
-#, no-wrap
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
-msgid ""
-"Set the Git namespace; see linkgit:gitnamespaces[7] for details. The "
-"`--namespace` command-line option also sets this value."
+#: en/git.txt:461
+#, priority:100
+msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
-#, no-wrap
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
-msgid ""
-"This should be a colon-separated list of absolute paths. If set, it is a "
-"list of directories that Git should not chdir up into while looking for a "
-"repository directory (useful for excluding slow-loading network "
-"directories). It will not exclude the current working directory or a "
-"GIT_DIR set on the command line or in the environment. Normally, Git has to "
-"read the entries in this list and resolve any symlink that might be present "
-"in order to compare them with the current directory. However, if even this "
-"access is slow, you can add an empty entry to the list to tell Git that the "
-"subsequent entries are not symlinks and needn't be resolved; e.g., "
-"`GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
+#: en/git.txt:476
+#, priority:100
+msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
-#, no-wrap
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
-msgid ""
-"When run in a directory that does not have \".git\" repository directory, "
-"Git tries to find such a directory in the parent directories to find the top "
-"of the working tree, but by default it does not cross filesystem "
-"boundaries. This environment variable can be set to true to tell Git not to "
-"stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will "
-"not affect an explicit repository directory set via `GIT_DIR` or on the "
-"command line."
+#: en/git.txt:486
+#, priority:100
+msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
-#, no-wrap
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
-msgid ""
-"If this variable is set to a path, non-worktree files that are normally in "
-"$GIT_DIR will be taken from this path instead. Worktree-specific files such "
-"as HEAD or index are taken from $GIT_DIR. See "
-"linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for "
-"details. This variable has lower precedence than other path variables such "
-"as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
+#: en/git.txt:495
+#, ignore-ellipsis, priority:100
+msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
-#, no-wrap
+#: en/git.txt:497
+#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
-#, no-wrap
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
-#, no-wrap
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
-#, no-wrap
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
-#, no-wrap
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
-#, no-wrap
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
-#, no-wrap
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
-#, fuzzy
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "linkgit:git-commit-tree[1]"
+#: en/git.txt:529
+#, priority:100
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
-#, no-wrap
+#: en/git.txt:531
+#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
-#, no-wrap
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
-msgid ""
-"Only valid setting is \"--unified=??\" or \"-u??\" to set the number of "
-"context lines shown when a unified diff is created. This takes precedence "
-"over any \"-U\" or \"--unified\" option value passed on the Git diff command "
-"line."
+#: en/git.txt:537
+#, priority:100
+msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
-#, no-wrap
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
-msgid ""
-"When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named "
-"by it is called, instead of the diff invocation described above. For a path "
-"that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 "
-"parameters:"
+#: en/git.txt:543
+#, priority:100
+msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
+#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
+#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
-#, no-wrap
+#: en/git.txt:548
+#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
+#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
-#, no-wrap
+#: en/git.txt:550
+#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
-#, no-wrap
+#: en/git.txt:550
+#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
+#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
-#, no-wrap
+#: en/git.txt:551
+#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
+#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
-msgid ""
-"The file parameters can point at the user's working file (e.g. `new-file` in "
-"\"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), "
-"or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` "
-"should not worry about unlinking the temporary file --- it is removed when "
-"`GIT_EXTERNAL_DIFF` exits."
+#: en/git.txt:558
+#, priority:100
+msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
-msgid ""
-"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, "
-"<path>."
+#: en/git.txt:561
+#, priority:100
+msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
-msgid ""
-"For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, "
-"`GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
+#: en/git.txt:564
+#, priority:100
+msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
-#, no-wrap
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
+#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
-#, no-wrap
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
+#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
-#, no-wrap
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
-msgid ""
-"A number controlling the amount of output shown by the recursive merge "
-"strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
+#: en/git.txt:577
+#, priority:100
+msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
-#, no-wrap
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
-msgid ""
-"This environment variable overrides `$PAGER`. If it is set to an empty "
-"string or to the value \"cat\", Git will not launch a pager. See also the "
-"`core.pager` option in linkgit:git-config[1]."
+#: en/git.txt:583
+#, priority:100
+msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
-#, no-wrap
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
-msgid ""
-"A number controlling how many seconds to delay before showing optional "
-"progress indicators. Defaults to 2."
+#: en/git.txt:587
+#, priority:100
+msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
-#, no-wrap
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
-msgid ""
-"This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by "
-"several Git commands when, on interactive mode, an editor is to be "
-"launched. See also linkgit:git-var[1] and the `core.editor` option in "
-"linkgit:git-config[1]."
+#: en/git.txt:593
+#, priority:100
+msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
-#, no-wrap
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
-#, no-wrap
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
-msgid ""
-"If either of these environment variables is set then 'git fetch' and 'git "
-"push' will use the specified command instead of 'ssh' when they need to "
-"connect to a remote system. The command-line parameters passed to the "
-"configured command are determined by the ssh variant. See `ssh.variant` "
-"option in linkgit:git-config[1] for details."
+#: en/git.txt:602
+#, priority:100
+msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
-msgid ""
-"`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by "
-"the shell, which allows additional arguments to be included. `$GIT_SSH` on "
-"the other hand must be just the path to a program (which can be a wrapper "
-"shell script, if additional arguments are needed)."
+#: en/git.txt:608
+#, priority:100
+msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
-msgid ""
-"Usually it is easier to configure any desired options through your personal "
-"`.ssh/config` file. Please consult your ssh documentation for further "
-"details."
+#: en/git.txt:612
+#, priority:100
+msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
-#, no-wrap
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
-msgid ""
-"If this environment variable is set, it overrides Git's autodetection "
-"whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, "
-"plink or tortoiseplink. This variable overrides the config setting "
-"`ssh.variant` that serves the same purpose."
+#: en/git.txt:618
+#, priority:100
+msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
-#, no-wrap
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
-msgid ""
-"If this environment variable is set, then Git commands which need to acquire "
-"passwords or passphrases (e.g. for HTTP or IMAP authentication) will call "
-"this program with a suitable prompt as command-line argument and read the "
-"password from its STDOUT. See also the `core.askPass` option in "
-"linkgit:git-config[1]."
+#: en/git.txt:625
+#, priority:100
+msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
-#, no-wrap
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
-msgid ""
-"If this environment variable is set to `0`, git will not prompt on the "
-"terminal (e.g., when asking for HTTP authentication)."
+#: en/git.txt:629
+#, priority:100
+msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
-#, no-wrap
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
-msgid ""
-"Whether to skip reading settings from the system-wide "
-"`$(prefix)/etc/gitconfig` file. This environment variable can be used along "
-"with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for "
-"a picky script, or you can set it temporarily to avoid using a buggy "
-"`/etc/gitconfig` file while waiting for someone with sufficient permissions "
-"to fix it."
+#: en/git.txt:637
+#, priority:100
+msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
-#, no-wrap
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
-#, no-wrap
+#: en/git.txt:648
+#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
"as 'git blame' (in incremental mode), 'git rev-list', 'git log',\n"
@@ -61787,713 +52928,548 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
-#, no-wrap
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
-msgid ""
-"Enables general trace messages, e.g. alias expansion, built-in command "
-"execution and external command execution."
+#: en/git.txt:652
+#, priority:100
+msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
-msgid ""
-"If this variable is set to \"1\", \"2\" or \"true\" (comparison is case "
-"insensitive), trace messages will be printed to stderr."
+#: en/git.txt:656 en/git.txt:734
+#, priority:100
+msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
-msgid ""
-"If the variable is set to an integer value greater than 2 and lower than 10 "
-"(strictly) then Git will interpret this value as an open file descriptor and "
-"will try to write the trace messages into this file descriptor."
+#: en/git.txt:661 en/git.txt:739
+#, priority:100
+msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
-msgid ""
-"Alternatively, if the variable is set to an absolute path (starting with a "
-"'/' character), Git will interpret this as a file path and will try to "
-"append the trace messages to it."
+#: en/git.txt:666
+#, priority:100
+msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
-msgid ""
-"Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case "
-"insensitive) disables trace messages."
+#: en/git.txt:669 en/git.txt:756
+#, priority:100
+msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
-#, no-wrap
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
-msgid ""
-"Enables trace messages for the filesystem monitor extension. See "
-"`GIT_TRACE` for available trace output options."
+#: en/git.txt:673
+#, priority:100
+msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
-#, no-wrap
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
-msgid ""
-"Enables trace messages for all accesses to any packs. For each access, the "
-"pack file name and an offset in the pack is recorded. This may be helpful "
-"for troubleshooting some pack-related performance problems. See `GIT_TRACE` "
-"for available trace output options."
+#: en/git.txt:680
+#, priority:100
+msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
-#, no-wrap
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
-msgid ""
-"Enables trace messages for all packets coming in or out of a given "
-"program. This can help with debugging object negotiation or other protocol "
-"issues. Tracing is turned off at a packet starting with \"PACK\" (but see "
-"`GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output "
-"options."
+#: en/git.txt:687
+#, priority:100
+msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
-#, no-wrap
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
-msgid ""
-"Enables tracing of packfiles sent or received by a given program. Unlike "
-"other trace output, this trace is verbatim: no headers, and no quoting of "
-"binary data. You almost certainly want to direct into a file (e.g., "
-"`GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal "
-"or mixing it with other trace output."
+#: en/git.txt:695
+#, priority:100
+msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
-msgid ""
-"Note that this is currently only implemented for the client side of clones "
-"and fetches."
+#: en/git.txt:698
+#, priority:100
+msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
-#, no-wrap
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
-msgid ""
-"Enables performance related trace messages, e.g. total execution time of "
-"each Git command. See `GIT_TRACE` for available trace output options."
+#: en/git.txt:703
+#, priority:100
+msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
-#, no-wrap
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
-msgid ""
-"Enables trace messages printing the .git, working tree and current working "
-"directory after Git has completed its setup phase. See `GIT_TRACE` for "
-"available trace output options."
+#: en/git.txt:708
+#, priority:100
+msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
-#, no-wrap
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
-msgid ""
-"Enables trace messages that can help debugging fetching / cloning of shallow "
-"repositories. See `GIT_TRACE` for available trace output options."
+#: en/git.txt:713
+#, priority:100
+msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
-#, no-wrap
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
-msgid ""
-"Enables a curl full trace dump of all incoming and outgoing data, including "
-"descriptive information, of the git transport protocol. This is similar to "
-"doing curl `--trace-ascii` on the command line. This option overrides "
-"setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for "
-"available trace output options."
+#: en/git.txt:721
+#, priority:100
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
-#, no-wrap
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
-msgid ""
-"When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data "
-"(that is, only dump info lines and headers)."
+#: en/git.txt:725
+#, priority:100
+msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
-#, no-wrap
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
-msgid ""
-"Enables more detailed trace messages from the \"trace2\" library. Output "
-"from `GIT_TRACE2` is a simple text-based format for human readability."
+#: en/git.txt:730
+#, priority:100
+msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
-msgid ""
-"Alternatively, if the variable is set to an absolute path (starting with a "
-"'/' character), Git will interpret this as a file path and will try to "
-"append the trace messages to it. If the path already exists and is a "
-"directory, the trace messages will be written to files (one per process) in "
-"that directory, named according to the last component of the SID and an "
-"optional counter (to avoid filename collisions)."
+#: en/git.txt:748
+#, priority:100
+msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
-msgid ""
-"In addition, if the variable is set to "
-"`af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path "
-"as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
+#: en/git.txt:753
+#, priority:100
+msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
+#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
-#, no-wrap
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
-msgid ""
-"This setting writes a JSON-based format that is suited for machine "
-"interpretation. See `GIT_TRACE2` for available trace output options and "
-"link:technical/api-trace2.html[Trace2 documentation] for full details."
+#: en/git.txt:766
+#, priority:100
+msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
-#, no-wrap
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
-msgid ""
-"In addition to the text-based messages available in `GIT_TRACE2`, this "
-"setting writes a column-based format for understanding nesting regions. See "
-"`GIT_TRACE2` for available trace output options and "
-"link:technical/api-trace2.html[Trace2 documentation] for full details."
+#: en/git.txt:773
+#, priority:100
+msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
-#, no-wrap
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
-msgid ""
-"This can be set to a comma-separated list of strings. When a curl trace is "
-"enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by "
-"the client is dumped, values of cookies whose key is in that list "
-"(case-sensitive) are redacted."
+#: en/git.txt:779
+#, priority:100
+msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
-#, no-wrap
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
-msgid ""
-"Setting this variable to `1` will cause Git to treat all pathspecs "
-"literally, rather than as glob patterns. For example, running "
-"`GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that "
-"touch the path `*.c`, not any paths that the glob `*.c` matches. You might "
-"want this if you are feeding literal paths to Git (e.g., paths previously "
-"given to you by `git ls-tree`, `--raw` diff output, etc)."
+#: en/git.txt:788
+#, priority:100
+msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
-#, no-wrap
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
-msgid ""
-"Setting this variable to `1` will cause Git to treat all pathspecs as glob "
-"patterns (aka \"glob\" magic)."
+#: en/git.txt:792
+#, priority:100
+msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
-#, no-wrap
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
-msgid ""
-"Setting this variable to `1` will cause Git to treat all pathspecs as "
-"literal (aka \"literal\" magic)."
+#: en/git.txt:796
+#, priority:100
+msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
-#, no-wrap
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
-msgid ""
-"Setting this variable to `1` will cause Git to treat all pathspecs as "
-"case-insensitive."
+#: en/git.txt:800
+#, priority:100
+msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
-#, no-wrap
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
-msgid ""
-"When a ref is updated, reflog entries are created to keep track of the "
-"reason why the ref was updated (which is typically the name of the "
-"high-level command that updated the ref), in addition to the old and new "
-"values of the ref. A scripted Porcelain command can use set_reflog_action "
-"helper function in `git-sh-setup` to set its name to this variable when it "
-"is invoked as the top level command by the end user, to be recorded in the "
-"body of the reflog."
+#: en/git.txt:810
+#, priority:100
+msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
-#, no-wrap
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
-msgid ""
-"If set to `1`, include broken or badly named refs when iterating over lists "
-"of refs. In a normal, non-corrupted repository, this does nothing. However, "
-"enabling it may help git to detect and abort some operations in the presence "
-"of broken refs. Git sets this variable automatically when performing "
-"destructive operations like linkgit:git-prune[1]. You should not need to set "
-"it yourself unless you want to be paranoid about making sure an operation "
-"has touched every ref (e.g., because you are cloning a repository to make a "
-"backup)."
+#: en/git.txt:821
+#, priority:100
+msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
-#, no-wrap
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
-msgid ""
-"If set to a colon-separated list of protocols, behave as if `protocol.allow` "
-"is set to `never`, and each of the listed protocols has "
-"`protocol.<name>.allow` set to `always` (overriding any existing "
-"configuration). In other words, any protocol not mentioned will be "
-"disallowed (i.e., this is a whitelist, not a blacklist). See the description "
-"of `protocol.allow` in linkgit:git-config[1] for more details."
+#: en/git.txt:830
+#, priority:100
+msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
-#, no-wrap
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
-msgid ""
-"Set to 0 to prevent protocols used by fetch/push/clone which are configured "
-"to the `user` state. This is useful to restrict recursive submodule "
-"initialization from an untrusted repository or for programs which feed "
-"potentially-untrusted URLS to git commands. See linkgit:git-config[1] for "
-"more details."
+#: en/git.txt:837
+#, priority:100
+msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
-#, no-wrap
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
-msgid ""
-"For internal use only. Used in handshaking the wire protocol. Contains a "
-"colon ':' separated list of keys with optional values 'key[=value]'. "
-"Presence of unknown keys and values must be ignored."
+#: en/git.txt:843
+#, priority:100
+msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
-#, no-wrap
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
-msgid ""
-"If set to `0`, Git will complete any requested operation without performing "
-"any optional sub-operations that require taking a lock. For example, this "
-"will prevent `git status` from refreshing the index as a side effect. This "
-"is useful for processes running in the background which do not want to cause "
-"lock contention with other operations on the repository. Defaults to `1`."
+#: en/git.txt:851
+#, priority:100
+msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
-#, no-wrap
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
-#, no-wrap
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
-#, no-wrap
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
-msgid ""
-"Windows-only: allow redirecting the standard input/output/error handles to "
-"paths specified by the environment variables. This is particularly useful in "
-"multi-threaded applications where the canonical way to pass standard handles "
-"via `CreateProcess()` is not an option because it would require the handles "
-"to be marked inheritable (and consequently *every* spawned process would "
-"inherit them, possibly blocking regular Git operations). The primary "
-"intended use case is to use named pipes for communication "
-"(e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
+#: en/git.txt:864
+#, priority:100
+msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
-msgid ""
-"Two special values are supported: `off` will simply close the corresponding "
-"standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will "
-"be redirected to the same handle as standard output."
+#: en/git.txt:869
+#, priority:100
+msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
-#, no-wrap
+#: en/git.txt:870
+#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
-msgid ""
-"If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. "
-"This affects indications of detached HEADs (linkgit:git-checkout[1]) and the "
-"raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases "
-"mentioned is no longer considered adequate and support for it is likely to "
-"be removed in the foreseeable future (along with the variable)."
+#: en/git.txt:878
+#, priority:100
+msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
-#, no-wrap
+#: en/git.txt:880
+#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
-msgid ""
-"More detail on the following is available from the "
-"link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] "
-"and linkgit:gitcore-tutorial[7]."
+#: en/git.txt:885
+#, priority:100
+msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
-msgid ""
-"A Git project normally consists of a working directory with a \".git\" "
-"subdirectory at the top level. The .git directory contains, among other "
-"things, a compressed object database representing the complete history of "
-"the project, an \"index\" file which links that history to the current "
-"contents of the working tree, and named pointers into that history such as "
-"tags and branch heads."
+#: en/git.txt:892
+#, priority:100
+msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
-msgid ""
-"The object database contains objects of three main types: blobs, which hold "
-"file data; trees, which point to blobs and other trees to build up directory "
-"hierarchies; and commits, which each reference a single tree and some number "
-"of parent commits."
+#: en/git.txt:897
+#, priority:100
+msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
-msgid ""
-"The commit, equivalent to what other systems call a \"changeset\" or "
-"\"version\", represents a step in the project's history, and each parent "
-"represents an immediately preceding step. Commits with more than one parent "
-"represent merges of independent lines of development."
+#: en/git.txt:902
+#, priority:100
+msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
-msgid ""
-"All objects are named by the SHA-1 hash of their contents, normally written "
-"as a string of 40 hex digits. Such names are globally unique. The entire "
-"history leading up to a commit can be vouched for by signing just that "
-"commit. A fourth object type, the tag, is provided for this purpose."
+#: en/git.txt:908
+#, priority:100
+msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
-msgid ""
-"When first created, objects are stored in individual files, but for "
-"efficiency may later be compressed together into \"pack files\"."
+#: en/git.txt:911
+#, priority:100
+msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
-msgid ""
-"Named pointers called refs mark interesting points in history. A ref may "
-"contain the SHA-1 name of an object or the name of another ref. Refs with "
-"names beginning `ref/head/` contain the SHA-1 name of the most recent commit "
-"(or \"head\") of a branch under development. SHA-1 names of tags of "
-"interest are stored under `ref/tags/`. A special ref named `HEAD` contains "
-"the name of the currently checked-out branch."
+#: en/git.txt:918
+#, priority:100
+msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
-msgid ""
-"The index file is initialized with a list of all paths and, for each path, a "
-"blob object and a set of attributes. The blob object represents the "
-"contents of the file as of the head of the current branch. The attributes "
-"(last modified time, size, etc.) are taken from the corresponding file in "
-"the working tree. Subsequent changes to the working tree can be found by "
-"comparing these attributes. The index may be updated with new content, and "
-"new commits may be created from the content stored in the index."
+#: en/git.txt:927
+#, priority:100
+msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
-msgid ""
-"The index is also capable of storing multiple entries (called \"stages\") "
-"for a given pathname. These stages are used to hold the various unmerged "
-"version of a file when a merge is in progress."
+#: en/git.txt:931
+#, priority:100
+msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
-#, no-wrap
+#: en/git.txt:933
+#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
-msgid ""
-"See the references in the \"description\" section to get started using Git. "
-"The following is probably more detail than necessary for a first-time user."
+#: en/git.txt:938
+#, priority:100
+msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
-msgid ""
-"The link:user-manual.html#git-concepts[Git concepts chapter of the "
-"user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to "
-"the underlying Git architecture."
+#: en/git.txt:942
+#, priority:100
+msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
+#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
-msgid ""
-"See also the link:howto-index.html[howto] documents for some useful "
-"examples."
+#: en/git.txt:947
+#, priority:100
+msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
-msgid ""
-"The internals are documented in the link:technical/api-index.html[Git API "
-"documentation]."
+#: en/git.txt:950
+#, priority:100
+msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
+#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
-#, no-wrap
+#: en/git.txt:956
+#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
-msgid ""
-"Git was started by Linus Torvalds, and is currently maintained by Junio C "
-"Hamano. Numerous contributions have come from the Git mailing list "
-"<git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary "
-"gives you a more complete list of contributors."
+#: en/git.txt:961
+#, priority:100
+msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
-msgid ""
-"If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] "
-"and linkgit:git-blame[1] can show you the authors for specific parts of the "
-"project."
+#: en/git.txt:965
+#, priority:100
+msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
-#, no-wrap
+#: en/git.txt:967
+#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
-msgid ""
-"Report bugs to the Git mailing list <git@vger.kernel.org> where the "
-"development and maintenance is primarily done. You do not have to be "
-"subscribed to the list to send a message there. See the list archive at "
-"https://lore.kernel.org/git for previous bug reports and other discussions."
+#: en/git.txt:974
+#, priority:100
+msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
-msgid ""
-"Issues which are security relevant should be disclosed privately to the Git "
-"Security mailing list <git-security@googlegroups.com>."
+#: en/git.txt:977
+#, priority:100
+msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
-msgid ""
-"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
-"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], "
-"linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The "
-"Git User's Manual], linkgit:gitworkflows[7]"
+#: en/git.txt:985
+#, priority:100
+msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-unpack-file(1)"
msgstr "git-unpack-file(1)"
#. type: Plain text
#: en/git-unpack-file.txt:7
+#, priority:100
msgid "git-unpack-file - Creates a temporary file with a blob's contents"
msgstr ""
#. type: Plain text
#: en/git-unpack-file.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git unpack-file' <blob>\n"
msgstr ""
#. type: Plain text
#: en/git-unpack-file.txt:20
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"Creates a file holding the contents of the blob specified by sha1. It\n"
"returns the name of the temporary file in the following format:\n"
@@ -62502,93 +53478,91 @@ msgstr ""
#. type: Plain text
#: en/git-unpack-file.txt:25
+#, priority:100
msgid "Must be a blob id"
msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-unpack-objects(1)"
msgstr "git-unpack-objects(1)"
#. type: Plain text
#: en/git-unpack-objects.txt:7
+#, priority:100
msgid "git-unpack-objects - Unpack objects from a packed archive"
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:20
-msgid ""
-"Read a packed archive (.pack) from the standard input, expanding the objects "
-"contained within and writing them into the repository in \"loose\" (one "
-"object per file) format."
+#, priority:100
+msgid "Read a packed archive (.pack) from the standard input, expanding the objects contained within and writing them into the repository in \"loose\" (one object per file) format."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:24
-msgid ""
-"Objects that already exist in the repository will *not* be unpacked from the "
-"packfile. Therefore, nothing will be unpacked if you use this command on a "
-"packfile that exists within the target repository."
+#, priority:100
+msgid "Objects that already exist in the repository will *not* be unpacked from the packfile. Therefore, nothing will be unpacked if you use this command on a packfile that exists within the target repository."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:27
-msgid ""
-"See linkgit:git-repack[1] for options to generate new packs and replace "
-"existing ones."
+#, priority:100
+msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:32
+#, priority:100
msgid "Dry run. Check the pack file without actually unpacking"
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:33
+#, priority:100
msgid "the objects."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
+#, priority:100
msgid "The command usually shows percentage progress. This flag suppresses it."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:43
-msgid ""
-"When unpacking a corrupt packfile, the command dies at the first "
-"corruption. This flag tells it to keep going and make the best effort to "
-"recover as many objects as possible."
+#, priority:100
+msgid "When unpacking a corrupt packfile, the command dies at the first corruption. This flag tells it to keep going and make the best effort to recover as many objects as possible."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:46
+#, priority:100
msgid "Don't write objects with broken content or links."
msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-update-index(1)"
msgstr "git-update-index(1)"
#. type: Plain text
#: en/git-update-index.txt:7
+#, priority:100
msgid "git-update-index - Register file contents in the working tree to the index"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:30
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git update-index'\n"
"\t [--add] [--remove | --force-remove] [--replace]\n"
@@ -62612,593 +53586,499 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:36
-msgid ""
-"Modifies the index or directory cache. Each file mentioned is updated into "
-"the index and any 'unmerged' or 'needs updating' state is cleared."
+#, priority:100
+msgid "Modifies the index or directory cache. Each file mentioned is updated into the index and any 'unmerged' or 'needs updating' state is cleared."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:39
-msgid ""
-"See also linkgit:git-add[1] for a more user-friendly way to do some of the "
-"most common operations on the index."
+#, priority:100
+msgid "See also linkgit:git-add[1] for a more user-friendly way to do some of the most common operations on the index."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:42
-msgid ""
-"The way 'git update-index' handles files it is told about can be modified "
-"using the various options:"
+#, priority:100
+msgid "The way 'git update-index' handles files it is told about can be modified using the various options:"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:49
-msgid ""
-"If a specified file isn't in the index already then it's added. Default "
-"behaviour is to ignore new files."
+#, priority:100
+msgid "If a specified file isn't in the index already then it's added. Default behaviour is to ignore new files."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:50
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--remove"
msgstr "--remove"
#. type: Plain text
#: en/git-update-index.txt:54
-msgid ""
-"If a specified file is in the index but is missing then it's removed. "
-"Default behavior is to ignore removed file."
+#, priority:100
+msgid "If a specified file is in the index but is missing then it's removed. Default behavior is to ignore removed file."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:58
-msgid ""
-"Looks at the current index and checks to see if merges or updates are needed "
-"by checking stat() information."
+#, priority:100
+msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:62
-msgid ""
-"Quiet. If --refresh finds that the index needs an update, the default "
-"behavior is to error out. This option makes"
+#, priority:100
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:63
+#, priority:100
msgid "'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:64
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--ignore-submodules"
msgstr "--ignore-submodules"
#. type: Plain text
#: en/git-update-index.txt:67
-msgid ""
-"Do not try to update submodules. This option is only respected when passed "
-"before --refresh."
+#, priority:100
+msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:70
+#, priority:100
msgid "If --refresh finds unmerged changes in the index, the default"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:71
+#, priority:100
msgid "behavior is to error out. This option makes 'git update-index'"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
+#, no-wrap, priority:100
msgid "continue anyway.\n"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:75
+#, priority:100
msgid "Ignores missing files during a --refresh"
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:76
-#, no-wrap
+#, no-wrap, priority:100
msgid "--cacheinfo <mode>,<object>,<path>"
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:77
-#, no-wrap
+#, no-wrap, priority:100
msgid "--cacheinfo <mode> <object> <path>"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:82
-msgid ""
-"Directly insert the specified info into the index. For backward "
-"compatibility, you can also give these three arguments as three separate "
-"parameters, but new users are encouraged to use a single-parameter form."
+#, priority:100
+msgid "Directly insert the specified info into the index. For backward compatibility, you can also give these three arguments as three separate parameters, but new users are encouraged to use a single-parameter form."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--index-info"
msgstr "--index-info"
#. type: Plain text
#: en/git-update-index.txt:85
+#, priority:100
msgid "Read index information from stdin."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:88
+#, priority:100
msgid "Set the execute permissions on the updated files."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:89
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]assume-unchanged"
msgstr "--[no-]assume-unchanged"
#. type: Plain text
#: en/git-update-index.txt:101
-msgid ""
-"When this flag is specified, the object names recorded for the paths are not "
-"updated. Instead, this option sets/unsets the \"assume unchanged\" bit for "
-"the paths. When the \"assume unchanged\" bit is on, the user promises not "
-"to change the file and allows Git to assume that the working tree file "
-"matches what is recorded in the index. If you want to change the working "
-"tree file, you need to unset the bit to tell Git. This is sometimes helpful "
-"when working with a big project on a filesystem that has very slow lstat(2) "
-"system call (e.g. cifs)."
+#, priority:100
+msgid "When this flag is specified, the object names recorded for the paths are not updated. Instead, this option sets/unsets the \"assume unchanged\" bit for the paths. When the \"assume unchanged\" bit is on, the user promises not to change the file and allows Git to assume that the working tree file matches what is recorded in the index. If you want to change the working tree file, you need to unset the bit to tell Git. This is sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e.g. cifs)."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:106
-msgid ""
-"Git will fail (gracefully) in case it needs to modify this file in the index "
-"e.g. when merging in a commit; thus, in case the assumed-untracked file is "
-"changed upstream, you will need to handle the situation manually."
+#, priority:100
+msgid "Git will fail (gracefully) in case it needs to modify this file in the index e.g. when merging in a commit; thus, in case the assumed-untracked file is changed upstream, you will need to handle the situation manually."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:107
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--really-refresh"
msgstr "--really-refresh"
#. type: Plain text
#: en/git-update-index.txt:110
-msgid ""
-"Like `--refresh`, but checks stat information unconditionally, without "
-"regard to the \"assume unchanged\" setting."
+#, priority:100
+msgid "Like `--refresh`, but checks stat information unconditionally, without regard to the \"assume unchanged\" setting."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:111
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]skip-worktree"
msgstr "--[no-]skip-worktree"
#. type: Plain text
#: en/git-update-index.txt:116
-msgid ""
-"When one of these flags is specified, the object name recorded for the paths "
-"are not updated. Instead, these options set and unset the \"skip-worktree\" "
-"bit for the paths. See section \"Skip-worktree bit\" below for more "
-"information."
+#, priority:100
+msgid "When one of these flags is specified, the object name recorded for the paths are not updated. Instead, these options set and unset the \"skip-worktree\" bit for the paths. See section \"Skip-worktree bit\" below for more information."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:118
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]ignore-skip-worktree-entries"
msgstr "--[no-]ignore-skip-worktree-entries"
#. type: Plain text
#: en/git-update-index.txt:121
-msgid ""
-"Do not remove skip-worktree (AKA \"index-only\") entries even when the "
-"`--remove` option was specified."
+#, priority:100
+msgid "Do not remove skip-worktree (AKA \"index-only\") entries even when the `--remove` option was specified."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:122
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]fsmonitor-valid"
msgstr "--[no-]fsmonitor-valid"
#. type: Plain text
#: en/git-update-index.txt:127
-msgid ""
-"When one of these flags is specified, the object name recorded for the paths "
-"are not updated. Instead, these options set and unset the \"fsmonitor "
-"valid\" bit for the paths. See section \"File System Monitor\" below for "
-"more information."
+#, priority:100
+msgid "When one of these flags is specified, the object name recorded for the paths are not updated. Instead, these options set and unset the \"fsmonitor valid\" bit for the paths. See section \"File System Monitor\" below for more information."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:129
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--again"
msgstr "--again"
#. type: Plain text
#: en/git-update-index.txt:132
-msgid ""
-"Runs 'git update-index' itself on the paths whose index entries are "
-"different from those from the `HEAD` commit."
+#, priority:100
+msgid "Runs 'git update-index' itself on the paths whose index entries are different from those from the `HEAD` commit."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:133
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--unresolve"
msgstr "--unresolve"
#. type: Plain text
#: en/git-update-index.txt:136
-msgid ""
-"Restores the 'unmerged' or 'needs updating' state of a file during a merge "
-"if it was cleared by accident."
+#, priority:100
+msgid "Restores the 'unmerged' or 'needs updating' state of a file during a merge if it was cleared by accident."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:137
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--info-only"
msgstr "--info-only"
#. type: Plain text
#: en/git-update-index.txt:141
-msgid ""
-"Do not create objects in the object database for all <file> arguments that "
-"follow this flag; just insert their object IDs into the index."
+#, priority:100
+msgid "Do not create objects in the object database for all <file> arguments that follow this flag; just insert their object IDs into the index."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:142
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--force-remove"
msgstr "--force-remove"
#. type: Plain text
#: en/git-update-index.txt:145
-msgid ""
-"Remove the file from the index even when the working directory still has "
-"such a file. (Implies --remove.)"
+#, priority:100
+msgid "Remove the file from the index even when the working directory still has such a file. (Implies --remove.)"
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:146
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--replace"
msgstr "--replace"
#. type: Plain text
#: en/git-update-index.txt:153
-msgid ""
-"By default, when a file `path` exists in the index, 'git update-index' "
-"refuses an attempt to add `path/file`. Similarly if a file `path/file` "
-"exists, a file `path` cannot be added. With --replace flag, existing "
-"entries that conflict with the entry being added are automatically removed "
-"with warning messages."
+#, priority:100
+msgid "By default, when a file `path` exists in the index, 'git update-index' refuses an attempt to add `path/file`. Similarly if a file `path/file` exists, a file `path` cannot be added. With --replace flag, existing entries that conflict with the entry being added are automatically removed with warning messages."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:161
+#, priority:100
msgid "Report what is being added and removed from index."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:162
-#, no-wrap
+#, no-wrap, priority:100
msgid "--index-version <n>"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:167
-msgid ""
-"Write the resulting index out in the named on-disk format version. "
-"Supported versions are 2, 3 and 4. The current default version is 2 or 3, "
-"depending on whether extra features are used, such as `git add -N`."
+#, priority:100
+msgid "Write the resulting index out in the named on-disk format version. Supported versions are 2, 3 and 4. The current default version is 2 or 3, depending on whether extra features are used, such as `git add -N`."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:173
-msgid ""
-"Version 4 performs a simple pathname compression that reduces index size by "
-"30%-50% on large repositories, which results in faster load time. Version 4 "
-"is relatively young (first released in 1.8.0 in October 2012). Other Git "
-"implementations such as JGit and libgit2 may not support it yet."
+#, priority:100
+msgid "Version 4 performs a simple pathname compression that reduces index size by 30%-50% on large repositories, which results in faster load time. Version 4 is relatively young (first released in 1.8.0 in October 2012). Other Git implementations such as JGit and libgit2 may not support it yet."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:177
-msgid ""
-"Only meaningful with `--stdin` or `--index-info`; paths are separated with "
-"NUL character instead of LF."
+#, priority:100
+msgid "Only meaningful with `--stdin` or `--index-info`; paths are separated with NUL character instead of LF."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:178
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--split-index"
msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:179
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-split-index"
msgstr "--no-split-index"
#. type: Plain text
#: en/git-update-index.txt:184
-msgid ""
-"Enable or disable split index mode. If split-index mode is already enabled "
-"and `--split-index` is given again, all changes in $GIT_DIR/index are pushed "
-"back to the shared index file."
+#, priority:100
+msgid "Enable or disable split index mode. If split-index mode is already enabled and `--split-index` is given again, all changes in $GIT_DIR/index are pushed back to the shared index file."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:190
-msgid ""
-"These options take effect whatever the value of the `core.splitIndex` "
-"configuration variable (see linkgit:git-config[1]). But a warning is emitted "
-"when the change goes against the configured value, as the configured value "
-"will take effect next time the index is read and this will remove the "
-"intended effect of the option."
+#, priority:100
+msgid "These options take effect whatever the value of the `core.splitIndex` configuration variable (see linkgit:git-config[1]). But a warning is emitted when the change goes against the configured value, as the configured value will take effect next time the index is read and this will remove the intended effect of the option."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:191
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--untracked-cache"
msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:192
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-untracked-cache"
msgstr "--no-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:195
-msgid ""
-"Enable or disable untracked cache feature. Please use "
-"`--test-untracked-cache` before enabling it."
+#, priority:100
+msgid "Enable or disable untracked cache feature. Please use `--test-untracked-cache` before enabling it."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:201
-msgid ""
-"These options take effect whatever the value of the `core.untrackedCache` "
-"configuration variable (see linkgit:git-config[1]). But a warning is emitted "
-"when the change goes against the configured value, as the configured value "
-"will take effect next time the index is read and this will remove the "
-"intended effect of the option."
+#, priority:100
+msgid "These options take effect whatever the value of the `core.untrackedCache` configuration variable (see linkgit:git-config[1]). But a warning is emitted when the change goes against the configured value, as the configured value will take effect next time the index is read and this will remove the intended effect of the option."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:202
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--test-untracked-cache"
msgstr "--test-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:211
-msgid ""
-"Only perform tests on the working directory to make sure untracked cache can "
-"be used. You have to manually enable untracked cache using "
-"`--untracked-cache` or `--force-untracked-cache` or the "
-"`core.untrackedCache` configuration variable afterwards if you really want "
-"to use it. If a test fails the exit code is 1 and a message explains what is "
-"not working as needed, otherwise the exit code is 0 and OK is printed."
+#, priority:100
+msgid "Only perform tests on the working directory to make sure untracked cache can be used. You have to manually enable untracked cache using `--untracked-cache` or `--force-untracked-cache` or the `core.untrackedCache` configuration variable afterwards if you really want to use it. If a test fails the exit code is 1 and a message explains what is not working as needed, otherwise the exit code is 0 and OK is printed."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:212
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--force-untracked-cache"
msgstr "--force-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:217
-msgid ""
-"Same as `--untracked-cache`. Provided for backwards compatibility with older "
-"versions of Git where `--untracked-cache` used to imply "
-"`--test-untracked-cache` but this option would enable the extension "
-"unconditionally."
+#, priority:100
+msgid "Same as `--untracked-cache`. Provided for backwards compatibility with older versions of Git where `--untracked-cache` used to imply `--test-untracked-cache` but this option would enable the extension unconditionally."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:218
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--fsmonitor"
msgstr "--fsmonitor"
#. type: Labeled list
#: en/git-update-index.txt:219
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--no-fsmonitor"
msgstr "--no-fsmonitor"
#. type: Plain text
#: en/git-update-index.txt:226
-msgid ""
-"Enable or disable files system monitor feature. These options take effect "
-"whatever the value of the `core.fsmonitor` configuration variable (see "
-"linkgit:git-config[1]). But a warning is emitted when the change goes "
-"against the configured value, as the configured value will take effect next "
-"time the index is read and this will remove the intended effect of the "
-"option."
+#, priority:100
+msgid "Enable or disable files system monitor feature. These options take effect whatever the value of the `core.fsmonitor` configuration variable (see linkgit:git-config[1]). But a warning is emitted when the change goes against the configured value, as the configured value will take effect next time the index is read and this will remove the intended effect of the option."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:236
-msgid ""
-"Files to act on. Note that files beginning with '.' are discarded. This "
-"includes `./file` and `dir/./file`. If you don't want this, then use cleaner "
-"names. The same applies to directories ending '/' and paths with '//'"
+#, priority:100
+msgid "Files to act on. Note that files beginning with '.' are discarded. This includes `./file` and `dir/./file`. If you don't want this, then use cleaner names. The same applies to directories ending '/' and paths with '//'"
msgstr ""
#. type: Title -
#: en/git-update-index.txt:238
-#, no-wrap
+#, no-wrap, priority:100
msgid "USING --REFRESH"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:244
-msgid ""
-"`--refresh` does not calculate a new sha1 file or bring the index up to date "
-"for mode/content changes. But what it *does* do is to \"re-match\" the stat "
-"information of a file with the index, so that you can refresh the index for "
-"a file that hasn't been changed but where the stat entry is out of date."
+#, priority:100
+msgid "`--refresh` does not calculate a new sha1 file or bring the index up to date for mode/content changes. But what it *does* do is to \"re-match\" the stat information of a file with the index, so that you can refresh the index for a file that hasn't been changed but where the stat entry is out of date."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:247
-msgid ""
-"For example, you'd want to do this after doing a 'git read-tree', to link up "
-"the stat index details with the proper files."
+#, priority:100
+msgid "For example, you'd want to do this after doing a 'git read-tree', to link up the stat index details with the proper files."
msgstr ""
#. type: Title -
#: en/git-update-index.txt:249
-#, no-wrap
+#, no-wrap, priority:100
msgid "USING --CACHEINFO OR --INFO-ONLY"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:253
-msgid ""
-"`--cacheinfo` is used to register a file that is not in the current working "
-"directory. This is useful for minimum-checkout merging."
+#, priority:100
+msgid "`--cacheinfo` is used to register a file that is not in the current working directory. This is useful for minimum-checkout merging."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:255
+#, priority:100
msgid "To pretend you have a file at path with mode and sha1, say:"
msgstr ""
#. type: delimited block -
#: en/git-update-index.txt:258
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git update-index --add --cacheinfo <mode>,<sha1>,<path>\n"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:262
-msgid ""
-"`--info-only` is used to register files without placing them in the object "
-"database. This is useful for status-only repositories."
+#, priority:100
+msgid "`--info-only` is used to register files without placing them in the object database. This is useful for status-only repositories."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:268
-msgid ""
-"Both `--cacheinfo` and `--info-only` behave similarly: the index is updated "
-"but the object database isn't. `--cacheinfo` is useful when the object is "
-"in the database but the file isn't available locally. `--info-only` is "
-"useful when the file is available, but you do not wish to update the object "
-"database."
+#, priority:100
+msgid "Both `--cacheinfo` and `--info-only` behave similarly: the index is updated but the object database isn't. `--cacheinfo` is useful when the object is in the database but the file isn't available locally. `--info-only` is useful when the file is available, but you do not wish to update the object database."
msgstr ""
#. type: Title -
#: en/git-update-index.txt:271
-#, no-wrap
+#, no-wrap, priority:100
msgid "USING --INDEX-INFO"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:276
-msgid ""
-"`--index-info` is a more powerful mechanism that lets you feed multiple "
-"entry definitions from the standard input, and designed specifically for "
-"scripts. It can take inputs of three formats:"
+#, priority:100
+msgid "`--index-info` is a more powerful mechanism that lets you feed multiple entry definitions from the standard input, and designed specifically for scripts. It can take inputs of three formats:"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:278
-#, no-wrap
+#, no-wrap, priority:100
msgid "mode SP type SP sha1 TAB path\n"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:280
+#, priority:100
msgid "This format is to stuff `git ls-tree` output into the index."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:282
-#, no-wrap
+#, no-wrap, priority:100
msgid "mode SP sha1 SP stage TAB path\n"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:285
-msgid ""
-"This format is to put higher order stages into the index file and matches "
-"'git ls-files --stage' output."
+#, priority:100
+msgid "This format is to put higher order stages into the index file and matches 'git ls-files --stage' output."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:287
-#, no-wrap
+#, no-wrap, priority:100
msgid "mode SP sha1 TAB path\n"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:290
-msgid ""
-"This format is no longer produced by any Git command, but is and will "
-"continue to be supported by `update-index --index-info`."
+#, priority:100
+msgid "This format is no longer produced by any Git command, but is and will continue to be supported by `update-index --index-info`."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:294
-msgid ""
-"To place a higher stage entry to the index, the path should first be removed "
-"by feeding a mode=0 entry for the path, and then feeding necessary input "
-"lines in the third format."
+#, priority:100
+msgid "To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and then feeding necessary input lines in the third format."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:296
+#, priority:100
msgid "For example, starting with this index:"
msgstr ""
#. type: delimited block -
#: en/git-update-index.txt:300
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git ls-files -s\n"
"100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz\n"
@@ -63206,12 +54086,13 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:303
+#, priority:100
msgid "you can feed the following input to `--index-info`:"
msgstr ""
#. type: delimited block -
#: en/git-update-index.txt:309
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git update-index --index-info\n"
"0 0000000000000000000000000000000000000000\tfrotz\n"
@@ -63221,16 +54102,13 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:315
-msgid ""
-"The first line of the input feeds 0 as the mode to remove the path; the "
-"SHA-1 does not matter as long as it is well formatted. Then the second and "
-"third line feeds stage 1 and stage 2 entries for that path. After the "
-"above, we would end up with this:"
+#, priority:100
+msgid "The first line of the input feeds 0 as the mode to remove the path; the SHA-1 does not matter as long as it is well formatted. Then the second and third line feeds stage 1 and stage 2 entries for that path. After the above, we would end up with this:"
msgstr ""
#. type: delimited block -
#: en/git-update-index.txt:320
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git ls-files -s\n"
"100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1\tfrotz\n"
@@ -63239,61 +54117,43 @@ msgstr ""
#. type: Title -
#: en/git-update-index.txt:324
-#, no-wrap
+#, no-wrap, priority:100
msgid "USING ``ASSUME UNCHANGED'' BIT"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:339
-msgid ""
-"Many operations in Git depend on your filesystem to have an efficient "
-"`lstat(2)` implementation, so that `st_mtime` information for working tree "
-"files can be cheaply checked to see if the file contents have changed from "
-"the version recorded in the index file. Unfortunately, some filesystems "
-"have inefficient `lstat(2)`. If your filesystem is one of them, you can set "
-"\"assume unchanged\" bit to paths you have not changed to cause Git not to "
-"do this check. Note that setting this bit on a path does not mean Git will "
-"check the contents of the file to see if it has changed -- it makes Git to "
-"omit any checking and assume it has *not* changed. When you make changes to "
-"working tree files, you have to explicitly tell Git about it by dropping "
-"\"assume unchanged\" bit, either before or after you modify them."
+#, priority:100
+msgid "Many operations in Git depend on your filesystem to have an efficient `lstat(2)` implementation, so that `st_mtime` information for working tree files can be cheaply checked to see if the file contents have changed from the version recorded in the index file. Unfortunately, some filesystems have inefficient `lstat(2)`. If your filesystem is one of them, you can set \"assume unchanged\" bit to paths you have not changed to cause Git not to do this check. Note that setting this bit on a path does not mean Git will check the contents of the file to see if it has changed -- it makes Git to omit any checking and assume it has *not* changed. When you make changes to working tree files, you have to explicitly tell Git about it by dropping \"assume unchanged\" bit, either before or after you modify them."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:344
-msgid ""
-"In order to set \"assume unchanged\" bit, use `--assume-unchanged` option. "
-"To unset, use `--no-assume-unchanged`. To see which files have the \"assume "
-"unchanged\" bit set, use `git ls-files -v` (see linkgit:git-ls-files[1])."
+#, priority:100
+msgid "In order to set \"assume unchanged\" bit, use `--assume-unchanged` option. To unset, use `--no-assume-unchanged`. To see which files have the \"assume unchanged\" bit set, use `git ls-files -v` (see linkgit:git-ls-files[1])."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:354
-msgid ""
-"The command looks at `core.ignorestat` configuration variable. When this is "
-"true, paths updated with `git update-index paths...` and paths updated with "
-"other Git commands that update both index and working tree (e.g. 'git apply "
-"--index', 'git checkout-index -u', and 'git read-tree -u') are automatically "
-"marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* "
-"set if `git update-index --refresh` finds the working tree file matches the "
-"index (use `git update-index --really-refresh` if you want to mark them as "
-"\"assume unchanged\")."
+#, ignore-ellipsis, priority:100
+msgid "The command looks at `core.ignorestat` configuration variable. When this is true, paths updated with `git update-index paths...` and paths updated with other Git commands that update both index and working tree (e.g. 'git apply --index', 'git checkout-index -u', and 'git read-tree -u') are automatically marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* set if `git update-index --refresh` finds the working tree file matches the index (use `git update-index --really-refresh` if you want to mark them as \"assume unchanged\")."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:359
+#, priority:100
msgid "To update and refresh only the files already checked out:"
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:364
-#, no-wrap
+#, no-wrap, priority:100
msgid "On an inefficient filesystem with `core.ignorestat` set"
msgstr ""
#. type: delimited block -
#: en/git-update-index.txt:380
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git update-index --really-refresh <1>\n"
"$ git update-index --no-assume-unchanged foo.c <2>\n"
@@ -63312,278 +54172,223 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:383
+#, priority:100
msgid "forces lstat(2) to set \"assume unchanged\" bits for paths that match index."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:384
+#, priority:100
msgid "mark the path to be edited."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:385
+#, priority:100
msgid "this does lstat(2) and finds index matches the path."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:386
+#, priority:100
msgid "this does lstat(2) and finds index does *not* match the path."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:387
+#, priority:100
msgid "registering the new version to index sets \"assume unchanged\" bit."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:388
+#, priority:100
msgid "and it is assumed unchanged."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:389
+#, priority:100
msgid "even after you edit it."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:390
+#, priority:100
msgid "you can tell about the change after the fact."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:391
+#, priority:100
msgid "now it checks with lstat(2) and finds it has been changed."
msgstr ""
#. type: Title -
#: en/git-update-index.txt:394
-#, no-wrap
+#, no-wrap, priority:100
msgid "SKIP-WORKTREE BIT"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:400
-msgid ""
-"Skip-worktree bit can be defined in one (long) sentence: When reading an "
-"entry, if it is marked as skip-worktree, then Git pretends its working "
-"directory version is up to date and read the index version instead."
+#, priority:100
+msgid "Skip-worktree bit can be defined in one (long) sentence: When reading an entry, if it is marked as skip-worktree, then Git pretends its working directory version is up to date and read the index version instead."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:408
-msgid ""
-"To elaborate, \"reading\" means checking for file existence, reading file "
-"attributes or file content. The working directory version may be present or "
-"absent. If present, its content may match against the index version or "
-"not. Writing is not affected by this bit, content safety is still first "
-"priority. Note that Git _can_ update working directory file, that is marked "
-"skip-worktree, if it is safe to do so (i.e. working directory version "
-"matches index version)"
+#, priority:100
+msgid "To elaborate, \"reading\" means checking for file existence, reading file attributes or file content. The working directory version may be present or absent. If present, its content may match against the index version or not. Writing is not affected by this bit, content safety is still first priority. Note that Git _can_ update working directory file, that is marked skip-worktree, if it is safe to do so (i.e. working directory version matches index version)"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:412
-msgid ""
-"Although this bit looks similar to assume-unchanged bit, its goal is "
-"different from assume-unchanged bit's. Skip-worktree also takes precedence "
-"over assume-unchanged bit when both are set."
+#, priority:100
+msgid "Although this bit looks similar to assume-unchanged bit, its goal is different from assume-unchanged bit's. Skip-worktree also takes precedence over assume-unchanged bit when both are set."
msgstr ""
#. type: Title -
#: en/git-update-index.txt:414
-#, no-wrap
+#, no-wrap, priority:100
msgid "SPLIT INDEX"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:418
-msgid ""
-"This mode is designed for repositories with very large indexes, and aims at "
-"reducing the time it takes to repeatedly write these indexes."
+#, priority:100
+msgid "This mode is designed for repositories with very large indexes, and aims at reducing the time it takes to repeatedly write these indexes."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:423
-msgid ""
-"In this mode, the index is split into two files, $GIT_DIR/index and "
-"$GIT_DIR/sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the "
-"split index, while the shared index file contains all index entries and "
-"stays unchanged."
+#, priority:100
+msgid "In this mode, the index is split into two files, $GIT_DIR/index and $GIT_DIR/sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the split index, while the shared index file contains all index entries and stays unchanged."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:428
-msgid ""
-"All changes in the split index are pushed back to the shared index file when "
-"the number of entries in the split index reaches a level specified by the "
-"splitIndex.maxPercentChange config variable (see linkgit:git-config[1])."
+#, priority:100
+msgid "All changes in the split index are pushed back to the shared index file when the number of entries in the split index reaches a level specified by the splitIndex.maxPercentChange config variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:433
-msgid ""
-"Each time a new shared index file is created, the old shared index files are "
-"deleted if their modification time is older than what is specified by the "
-"splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1])."
+#, priority:100
+msgid "Each time a new shared index file is created, the old shared index files are deleted if their modification time is older than what is specified by the splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:437
-msgid ""
-"To avoid deleting a shared index file that is still used, its modification "
-"time is updated to the current time every time a new split index based on "
-"the shared index file is either created or read from."
+#, priority:100
+msgid "To avoid deleting a shared index file that is still used, its modification time is updated to the current time every time a new split index based on the shared index file is either created or read from."
msgstr ""
#. type: Title -
#: en/git-update-index.txt:439
-#, no-wrap
+#, no-wrap, priority:100
msgid "UNTRACKED CACHE"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:443
-msgid ""
-"This cache is meant to speed up commands that involve determining untracked "
-"files such as `git status`."
+#, priority:100
+msgid "This cache is meant to speed up commands that involve determining untracked files such as `git status`."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:450
-msgid ""
-"This feature works by recording the mtime of the working tree directories "
-"and then omitting reading directories and stat calls against files in those "
-"directories whose mtime hasn't changed. For this to work the underlying "
-"operating system and file system must change the `st_mtime` field of "
-"directories if files in the directory are added, modified or deleted."
+#, priority:100
+msgid "This feature works by recording the mtime of the working tree directories and then omitting reading directories and stat calls against files in those directories whose mtime hasn't changed. For this to work the underlying operating system and file system must change the `st_mtime` field of directories if files in the directory are added, modified or deleted."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:455
-msgid ""
-"You can test whether the filesystem supports that with the "
-"`--test-untracked-cache` option. The `--untracked-cache` option used to "
-"implicitly perform that test in older versions of Git, but that's no longer "
-"the case."
+#, priority:100
+msgid "You can test whether the filesystem supports that with the `--test-untracked-cache` option. The `--untracked-cache` option used to implicitly perform that test in older versions of Git, but that's no longer the case."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:463
-msgid ""
-"If you want to enable (or disable) this feature, it is easier to use the "
-"`core.untrackedCache` configuration variable (see linkgit:git-config[1]) "
-"than using the `--untracked-cache` option to `git update-index` in each "
-"repository, especially if you want to do so across all repositories you use, "
-"because you can set the configuration variable to `true` (or `false`) in "
-"your `$HOME/.gitconfig` just once and have it affect all repositories you "
-"touch."
+#, priority:100
+msgid "If you want to enable (or disable) this feature, it is easier to use the `core.untrackedCache` configuration variable (see linkgit:git-config[1]) than using the `--untracked-cache` option to `git update-index` in each repository, especially if you want to do so across all repositories you use, because you can set the configuration variable to `true` (or `false`) in your `$HOME/.gitconfig` just once and have it affect all repositories you touch."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:469
-msgid ""
-"When the `core.untrackedCache` configuration variable is changed, the "
-"untracked cache is added to or removed from the index the next time a "
-"command reads the index; while when `--[no-|force-]untracked-cache` are "
-"used, the untracked cache is immediately added to or removed from the index."
+#, priority:100
+msgid "When the `core.untrackedCache` configuration variable is changed, the untracked cache is added to or removed from the index the next time a command reads the index; while when `--[no-|force-]untracked-cache` are used, the untracked cache is immediately added to or removed from the index."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:476
-msgid ""
-"Before 2.17, the untracked cache had a bug where replacing a directory with "
-"a symlink to another directory could cause it to incorrectly show files "
-"tracked by git as untracked. See the \"status: add a failing test showing a "
-"core.untrackedCache bug\" commit to git.git. A workaround for that is (and "
-"this might work for other undiscovered bugs in the future):"
+#, priority:100
+msgid "Before 2.17, the untracked cache had a bug where replacing a directory with a symlink to another directory could cause it to incorrectly show files tracked by git as untracked. See the \"status: add a failing test showing a core.untrackedCache bug\" commit to git.git. A workaround for that is (and this might work for other undiscovered bugs in the future):"
msgstr ""
#. type: delimited block -
#: en/git-update-index.txt:479
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git -c core.untrackedCache=false status\n"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:485
-msgid ""
-"This bug has also been shown to affect non-symlink cases of replacing a "
-"directory with a file when it comes to the internal structures of the "
-"untracked cache, but no case has been reported where this resulted in wrong "
-"\"git status\" output."
+#, priority:100
+msgid "This bug has also been shown to affect non-symlink cases of replacing a directory with a file when it comes to the internal structures of the untracked cache, but no case has been reported where this resulted in wrong \"git status\" output."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:491
-msgid ""
-"There are also cases where existing indexes written by git versions before "
-"2.17 will reference directories that don't exist anymore, potentially "
-"causing many \"could not open directory\" warnings to be printed on \"git "
-"status\". These are new warnings for existing issues that were previously "
-"silently discarded."
+#, priority:100
+msgid "There are also cases where existing indexes written by git versions before 2.17 will reference directories that don't exist anymore, potentially causing many \"could not open directory\" warnings to be printed on \"git status\". These are new warnings for existing issues that were previously silently discarded."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:495
-msgid ""
-"As with the bug described above the solution is to one-off do a \"git "
-"status\" run with `core.untrackedCache=false` to flush out the leftover bad "
-"data."
+#, priority:100
+msgid "As with the bug described above the solution is to one-off do a \"git status\" run with `core.untrackedCache=false` to flush out the leftover bad data."
msgstr ""
#. type: Title -
#: en/git-update-index.txt:497
-#, no-wrap
+#, no-wrap, priority:100
msgid "FILE SYSTEM MONITOR"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:501
-msgid ""
-"This feature is intended to speed up git operations for repos that have "
-"large working directories."
+#, priority:100
+msgid "This feature is intended to speed up git operations for repos that have large working directories."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:506
-msgid ""
-"It enables git to work together with a file system monitor (see the "
-"\"fsmonitor-watchman\" section of linkgit:githooks[5]) that can inform it as "
-"to what files have been modified. This enables git to avoid having to "
-"lstat() every file to find modified files."
+#, priority:100
+msgid "It enables git to work together with a file system monitor (see the \"fsmonitor-watchman\" section of linkgit:githooks[5]) that can inform it as to what files have been modified. This enables git to avoid having to lstat() every file to find modified files."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:510
-msgid ""
-"When used in conjunction with the untracked cache, it can further improve "
-"performance by avoiding the cost of scanning the entire working directory "
-"looking for new files."
+#, priority:100
+msgid "When used in conjunction with the untracked cache, it can further improve performance by avoiding the cost of scanning the entire working directory looking for new files."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:518
-msgid ""
-"If you want to enable (or disable) this feature, it is easier to use the "
-"`core.fsmonitor` configuration variable (see linkgit:git-config[1]) than "
-"using the `--fsmonitor` option to `git update-index` in each repository, "
-"especially if you want to do so across all repositories you use, because you "
-"can set the configuration variable in your `$HOME/.gitconfig` just once and "
-"have it affect all repositories you touch."
+#, priority:100
+msgid "If you want to enable (or disable) this feature, it is easier to use the `core.fsmonitor` configuration variable (see linkgit:git-config[1]) than using the `--fsmonitor` option to `git update-index` in each repository, especially if you want to do so across all repositories you use, because you can set the configuration variable in your `$HOME/.gitconfig` just once and have it affect all repositories you touch."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:523
-msgid ""
-"When the `core.fsmonitor` configuration variable is changed, the file system "
-"monitor is added to or removed from the index the next time a command reads "
-"the index. When `--[no-]fsmonitor` are used, the file system monitor is "
-"immediately added to or removed from the index."
+#, priority:100
+msgid "When the `core.fsmonitor` configuration variable is changed, the file system monitor is added to or removed from the index the next time a command reads the index. When `--[no-]fsmonitor` are used, the file system monitor is immediately added to or removed from the index."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:534
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"The command honors `core.filemode` configuration variable. If\n"
"your repository is on a filesystem whose executable bits are\n"
@@ -63596,156 +54401,139 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:539
-msgid ""
-"Quite similarly, if `core.symlinks` configuration variable is set to 'false' "
-"(see linkgit:git-config[1]), symbolic links are checked out as plain files, "
-"and this command does not modify a recorded file mode from symbolic link to "
-"regular file."
+#, priority:100
+msgid "Quite similarly, if `core.symlinks` configuration variable is set to 'false' (see linkgit:git-config[1]), symbolic links are checked out as plain files, and this command does not modify a recorded file mode from symbolic link to regular file."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:542
-msgid ""
-"The command looks at `core.ignorestat` configuration variable. See 'Using "
-"\"assume unchanged\" bit' section above."
+#, priority:100
+msgid "The command looks at `core.ignorestat` configuration variable. See 'Using \"assume unchanged\" bit' section above."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:547
-msgid ""
-"The command also looks at `core.trustctime` configuration variable. It can "
-"be useful when the inode change time is regularly modified by something "
-"outside Git (file system crawlers and backup systems use ctime for marking "
-"files processed) (see linkgit:git-config[1])."
+#, priority:100
+msgid "The command also looks at `core.trustctime` configuration variable. It can be useful when the inode change time is regularly modified by something outside Git (file system crawlers and backup systems use ctime for marking files processed) (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:551
-msgid ""
-"The untracked cache extension can be enabled by the `core.untrackedCache` "
-"configuration variable (see linkgit:git-config[1])."
+#, priority:100
+msgid "The untracked cache extension can be enabled by the `core.untrackedCache` configuration variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-update-ref.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-update-ref(1)"
msgstr "git-update-ref(1)"
#. type: Plain text
#: en/git-update-ref.txt:7
+#, priority:100
msgid "git-update-ref - Update the object name stored in a ref safely"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:12
-#, no-wrap
-msgid ""
-"'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | "
-"[--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
+#, no-wrap, priority:100
+msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:18
-msgid ""
-"Given two arguments, stores the <newvalue> in the <ref>, possibly "
-"dereferencing the symbolic refs. E.g. `git update-ref HEAD <newvalue>` "
-"updates the current branch head to the new object."
+#, priority:100
+msgid "Given two arguments, stores the <newvalue> in the <ref>, possibly dereferencing the symbolic refs. E.g. `git update-ref HEAD <newvalue>` updates the current branch head to the new object."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:27
-msgid ""
-"Given three arguments, stores the <newvalue> in the <ref>, possibly "
-"dereferencing the symbolic refs, after verifying that the current value of "
-"the <ref> matches <oldvalue>. E.g. `git update-ref refs/heads/master "
-"<newvalue> <oldvalue>` updates the master branch head to <newvalue> only if "
-"its current value is <oldvalue>. You can specify 40 \"0\" or an empty "
-"string as <oldvalue> to make sure that the ref you are creating does not "
-"exist."
+#, priority:100
+msgid "Given three arguments, stores the <newvalue> in the <ref>, possibly dereferencing the symbolic refs, after verifying that the current value of the <ref> matches <oldvalue>. E.g. `git update-ref refs/heads/master <newvalue> <oldvalue>` updates the master branch head to <newvalue> only if its current value is <oldvalue>. You can specify 40 \"0\" or an empty string as <oldvalue> to make sure that the ref you are creating does not exist."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:31
-msgid ""
-"It also allows a \"ref\" file to be a symbolic pointer to another ref file "
-"by starting with the four-byte header sequence of \"ref:\"."
+#, priority:100
+msgid "It also allows a \"ref\" file to be a symbolic pointer to another ref file by starting with the four-byte header sequence of \"ref:\"."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:39
-msgid ""
-"More importantly, it allows the update of a ref file to follow these "
-"symbolic pointers, whether they are symlinks or these \"regular file "
-"symbolic refs\". It follows *real* symlinks only if they start with "
-"\"refs/\": otherwise it will just try to read them and update them as a "
-"regular file (i.e. it will allow the filesystem to follow them, but will "
-"overwrite such a symlink to somewhere else with a regular filename)."
+#, priority:100
+msgid "More importantly, it allows the update of a ref file to follow these symbolic pointers, whether they are symlinks or these \"regular file symbolic refs\". It follows *real* symlinks only if they start with \"refs/\": otherwise it will just try to read them and update them as a regular file (i.e. it will allow the filesystem to follow them, but will overwrite such a symlink to somewhere else with a regular filename)."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:42
-msgid ""
-"If --no-deref is given, <ref> itself is overwritten, rather than the result "
-"of following the symbolic pointers."
+#, priority:100
+msgid "If --no-deref is given, <ref> itself is overwritten, rather than the result of following the symbolic pointers."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:44
+#, priority:100
msgid "In general, using"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:46
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tgit update-ref HEAD \"$head\"\n"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:48
+#, priority:100
msgid "should be a _lot_ safer than doing"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:50
-#, no-wrap
+#, no-wrap, priority:100
msgid "\techo \"$head\" > \"$GIT_DIR/HEAD\"\n"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:57
-msgid ""
-"both from a symlink following standpoint *and* an error checking "
-"standpoint. The \"refs/\" rule for symlinks means that symlinks that point "
-"to \"outside\" the tree are safe: they'll be followed for reading but not "
-"for writing (so we'll never write through a ref symlink to some other tree, "
-"if you have copied a whole archive by creating a symlink tree)."
+#, priority:100
+msgid "both from a symlink following standpoint *and* an error checking standpoint. The \"refs/\" rule for symlinks means that symlinks that point to \"outside\" the tree are safe: they'll be followed for reading but not for writing (so we'll never write through a ref symlink to some other tree, if you have copied a whole archive by creating a symlink tree)."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:60
-msgid ""
-"With `-d` flag, it deletes the named <ref> after verifying it still contains "
-"<oldvalue>."
+#, priority:100
+msgid "With `-d` flag, it deletes the named <ref> after verifying it still contains <oldvalue>."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:63
-msgid ""
-"With `--stdin`, update-ref reads instructions from standard input and "
-"performs all modifications together. Specify commands of the form:"
+#, priority:100
+msgid "With `--stdin`, update-ref reads instructions from standard input and performs all modifications together. Specify commands of the form:"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:69
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tupdate SP <ref> SP <newvalue> [SP <oldvalue>] LF\n"
"\tcreate SP <ref> SP <newvalue> LF\n"
@@ -63756,30 +54544,25 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:72
-msgid ""
-"With `--create-reflog`, update-ref will create a reflog for each ref even if "
-"one would not ordinarily be created."
+#, priority:100
+msgid "With `--create-reflog`, update-ref will create a reflog for each ref even if one would not ordinarily be created."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:77
-msgid ""
-"Quote fields containing whitespace as if they were strings in C source code; "
-"i.e., surrounded by double-quotes and with backslash escapes. Use 40 \"0\" "
-"characters or the empty string to specify a zero value. To specify a "
-"missing value, omit the value and its preceding SP entirely."
+#, priority:100
+msgid "Quote fields containing whitespace as if they were strings in C source code; i.e., surrounded by double-quotes and with backslash escapes. Use 40 \"0\" characters or the empty string to specify a zero value. To specify a missing value, omit the value and its preceding SP entirely."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:80
-msgid ""
-"Alternatively, use `-z` to specify in NUL-terminated format, without "
-"quoting:"
+#, priority:100
+msgid "Alternatively, use `-z` to specify in NUL-terminated format, without quoting:"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:86
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\tupdate SP <ref> NUL <newvalue> NUL [<oldvalue>] NUL\n"
"\tcreate SP <ref> NUL <newvalue> NUL\n"
@@ -63790,297 +54573,253 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:89
-msgid ""
-"In this format, use 40 \"0\" to specify a zero value, and use the empty "
-"string to specify a missing value."
+#, priority:100
+msgid "In this format, use 40 \"0\" to specify a zero value, and use the empty string to specify a missing value."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:93
-msgid ""
-"In either format, values can be specified in any form that Git recognizes as "
-"an object name. Commands in any other format or a repeated <ref> produce an "
-"error. Command meanings are:"
+#, priority:100
+msgid "In either format, values can be specified in any form that Git recognizes as an object name. Commands in any other format or a repeated <ref> produce an error. Command meanings are:"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:99
-msgid ""
-"Set <ref> to <newvalue> after verifying <oldvalue>, if given. Specify a "
-"zero <newvalue> to ensure the ref does not exist after the update and/or a "
-"zero <oldvalue> to make sure the ref does not exist before the update."
+#, priority:100
+msgid "Set <ref> to <newvalue> after verifying <oldvalue>, if given. Specify a zero <newvalue> to ensure the ref does not exist after the update and/or a zero <oldvalue> to make sure the ref does not exist before the update."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:103
-msgid ""
-"Create <ref> with <newvalue> after verifying it does not exist. The given "
-"<newvalue> may not be zero."
+#, priority:100
+msgid "Create <ref> with <newvalue> after verifying it does not exist. The given <newvalue> may not be zero."
msgstr ""
#. type: Labeled list
#: en/git-update-ref.txt:104
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "delete"
msgstr "delete"
#. type: Plain text
#: en/git-update-ref.txt:107
-msgid ""
-"Delete <ref> after verifying it exists with <oldvalue>, if given. If given, "
-"<oldvalue> may not be zero."
+#, priority:100
+msgid "Delete <ref> after verifying it exists with <oldvalue>, if given. If given, <oldvalue> may not be zero."
msgstr ""
#. type: Labeled list
#: en/git-update-ref.txt:108
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "verify"
msgstr "verify"
#. type: Plain text
#: en/git-update-ref.txt:111
-msgid ""
-"Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or "
-"missing, the ref must not exist."
+#, priority:100
+msgid "Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or missing, the ref must not exist."
msgstr ""
#. type: Labeled list
#: en/git-update-ref.txt:112
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "option"
msgstr "option"
#. type: Plain text
#: en/git-update-ref.txt:116
-msgid ""
-"Modify behavior of the next command naming a <ref>. The only valid option "
-"is `no-deref` to avoid dereferencing a symbolic ref."
+#, priority:100
+msgid "Modify behavior of the next command naming a <ref>. The only valid option is `no-deref` to avoid dereferencing a symbolic ref."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:122
-msgid ""
-"If all <ref>s can be locked with matching <oldvalue>s simultaneously, all "
-"modifications are performed. Otherwise, no modifications are performed. "
-"Note that while each individual <ref> is updated or deleted atomically, a "
-"concurrent reader may still see a subset of the modifications."
+#, priority:100
+msgid "If all <ref>s can be locked with matching <oldvalue>s simultaneously, all modifications are performed. Otherwise, no modifications are performed. Note that while each individual <ref> is updated or deleted atomically, a concurrent reader may still see a subset of the modifications."
msgstr ""
#. type: Title -
#: en/git-update-ref.txt:124
-#, no-wrap
+#, no-wrap, priority:100
msgid "LOGGING UPDATES"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:131
-msgid ""
-"If config parameter \"core.logAllRefUpdates\" is true and the ref is one "
-"under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or the symbolic "
-"ref HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` "
-"will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing "
-"all symbolic refs before creating the log name) describing the change in ref "
-"value. Log lines are formatted as:"
+#, priority:100
+msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or the symbolic ref HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as:"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:133
-#, no-wrap
+#, no-wrap, priority:100
msgid " oldsha1 SP newsha1 SP committer LF\n"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:138
-msgid ""
-"Where \"oldsha1\" is the 40 character hexadecimal value previously stored in "
-"<ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and "
-"\"committer\" is the committer's name, email address and date in the "
-"standard Git committer ident format."
+#, priority:100
+msgid "Where \"oldsha1\" is the 40 character hexadecimal value previously stored in <ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and \"committer\" is the committer's name, email address and date in the standard Git committer ident format."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:140
+#, priority:100
msgid "Optionally with -m:"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:142
-#, no-wrap
+#, no-wrap, priority:100
msgid " oldsha1 SP newsha1 SP committer TAB message LF\n"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:145
-msgid ""
-"Where all fields are as described above and \"message\" is the value "
-"supplied to the -m option."
+#, priority:100
+msgid "Where all fields are as described above and \"message\" is the value supplied to the -m option."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:149
-msgid ""
-"An update will fail (without changing <ref>) if the current user is unable "
-"to create a new log file, append to the existing log file or does not have "
-"committer information available."
+#, priority:100
+msgid "An update will fail (without changing <ref>) if the current user is unable to create a new log file, append to the existing log file or does not have committer information available."
msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-update-server-info(1)"
msgstr "git-update-server-info(1)"
#. type: Plain text
#: en/git-update-server-info.txt:7
+#, priority:100
msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'git update-server-info'\n"
msgstr "git-update-server-info(1)"
#. type: Plain text
#: en/git-update-server-info.txt:21
-msgid ""
-"A dumb server that does not do on-the-fly pack generations must have some "
-"auxiliary information files in $GIT_DIR/info and $GIT_OBJECT_DIRECTORY/info "
-"directories to help clients discover what references and packs the server "
-"has. This command generates such auxiliary files."
+#, priority:100
+msgid "A dumb server that does not do on-the-fly pack generations must have some auxiliary information files in $GIT_DIR/info and $GIT_OBJECT_DIRECTORY/info directories to help clients discover what references and packs the server has. This command generates such auxiliary files."
msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:28
-msgid ""
-"Currently the command updates the following files. Please see "
-"linkgit:gitrepository-layout[5] for description of what they are for:"
+#, priority:100
+msgid "Currently the command updates the following files. Please see linkgit:gitrepository-layout[5] for description of what they are for:"
msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:30
+#, priority:100
msgid "objects/info/packs"
msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:32
+#, priority:100
msgid "info/refs"
msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-upload-archive(1)"
msgstr "git-upload-archive(1)"
#. type: Plain text
#: en/git-upload-archive.txt:7
+#, priority:100
msgid "git-upload-archive - Send archive back to git-archive"
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git upload-archive' <directory>\n"
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:18
-msgid ""
-"Invoked by 'git archive --remote' and sends a generated archive to the other "
-"end over the Git protocol."
+#, priority:100
+msgid "Invoked by 'git archive --remote' and sends a generated archive to the other end over the Git protocol."
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:22
-msgid ""
-"This command is usually not invoked directly by the end user. The UI for "
-"the protocol is on the 'git archive' side, and the program pair is meant to "
-"be used to get an archive from a remote repository."
+#, priority:100
+msgid "This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git archive' side, and the program pair is meant to be used to get an archive from a remote repository."
msgstr ""
#. type: Title -
#: en/git-upload-archive.txt:24 en/transfer-data-leaks.txt:2
-#, no-wrap
+#, no-wrap, priority:220
msgid "SECURITY"
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:32
-msgid ""
-"In order to protect the privacy of objects that have been removed from "
-"history but may not yet have been pruned, `git-upload-archive` avoids "
-"serving archives for commits and trees that are not reachable from the "
-"repository's refs. However, because calculating object reachability is "
-"computationally expensive, `git-upload-archive` implements a stricter but "
-"easier-to-check set of rules:"
+#, priority:100
+msgid "In order to protect the privacy of objects that have been removed from history but may not yet have been pruned, `git-upload-archive` avoids serving archives for commits and trees that are not reachable from the repository's refs. However, because calculating object reachability is computationally expensive, `git-upload-archive` implements a stricter but easier-to-check set of rules:"
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:35
-msgid ""
-"Clients may request a commit or tree that is pointed to directly by a "
-"ref. E.g., `git archive --remote=origin v1.0`."
+#, priority:100
+msgid "Clients may request a commit or tree that is pointed to directly by a ref. E.g., `git archive --remote=origin v1.0`."
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:38
-msgid ""
-"Clients may request a sub-tree within a commit or tree using the `ref:path` "
-"syntax. E.g., `git archive --remote=origin v1.0:Documentation`."
+#, priority:100
+msgid "Clients may request a sub-tree within a commit or tree using the `ref:path` syntax. E.g., `git archive --remote=origin v1.0:Documentation`."
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:43
-msgid ""
-"Clients may _not_ use other sha1 expressions, even if the end result is "
-"reachable. E.g., neither a relative commit like `master^` nor a literal sha1 "
-"like `abcd1234` is allowed, even if the result is reachable from the refs."
+#, priority:100
+msgid "Clients may _not_ use other sha1 expressions, even if the end result is reachable. E.g., neither a relative commit like `master^` nor a literal sha1 like `abcd1234` is allowed, even if the result is reachable from the refs."
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:48
-msgid ""
-"Note that rule 3 disallows many cases that do not have any privacy "
-"implications. These rules are subject to change in future versions of git, "
-"and the server accessed by `git archive --remote` may or may not follow "
-"these exact rules."
+#, priority:100
+msgid "Note that rule 3 disallows many cases that do not have any privacy implications. These rules are subject to change in future versions of git, and the server accessed by `git archive --remote` may or may not follow these exact rules."
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:54
-msgid ""
-"If the config option `uploadArchive.allowUnreachable` is true, these rules "
-"are ignored, and clients may use arbitrary sha1 expressions. This is useful "
-"if you do not care about the privacy of unreachable objects, or if your "
-"object database is already publicly available for access via non-smart-http."
+#, priority:100
+msgid "If the config option `uploadArchive.allowUnreachable` is true, these rules are ignored, and clients may use arbitrary sha1 expressions. This is useful if you do not care about the privacy of unreachable objects, or if your object database is already publicly available for access via non-smart-http."
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:59
+#, priority:100
msgid "The repository to get a tar archive from."
msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-upload-pack(1)"
msgstr "git-upload-pack(1)"
#. type: Plain text
#: en/git-upload-pack.txt:7
+#, priority:100
msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
msgstr ""
#. type: Plain text
#: en/git-upload-pack.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"'git-upload-pack' [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
"\t\t [--advertise-refs] <directory>\n"
@@ -64088,71 +54827,61 @@ msgstr ""
#. type: Plain text
#: en/git-upload-pack.txt:19
-msgid ""
-"Invoked by 'git fetch-pack', learns what objects the other side is missing, "
-"and sends them after packing."
+#, priority:100
+msgid "Invoked by 'git fetch-pack', learns what objects the other side is missing, and sends them after packing."
msgstr ""
#. type: Plain text
#: en/git-upload-pack.txt:24
-msgid ""
-"This command is usually not invoked directly by the end user. The UI for "
-"the protocol is on the 'git fetch-pack' side, and the program pair is meant "
-"to be used to pull updates from a remote repository. For push operations, "
-"see 'git send-pack'."
+#, priority:100
+msgid "This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git fetch-pack' side, and the program pair is meant to be used to pull updates from a remote repository. For push operations, see 'git send-pack'."
msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:28
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--[no-]strict"
msgstr "--[no-]strict"
#. type: Plain text
#: en/git-upload-pack.txt:30
-#, fuzzy
+#, fuzzy, priority:100
msgid "Do not try <directory>/.git/ if <directory> is no Git directory."
msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
#. type: Plain text
#: en/git-upload-pack.txt:33
-#, fuzzy
+#, fuzzy, priority:100
msgid "Interrupt transfer after <n> seconds of inactivity."
msgstr "interrumpir transferencia tras <n> segundos de inactividad"
#. type: Labeled list
#: en/git-upload-pack.txt:34
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stateless-rpc"
msgstr "--stateless-rpc"
#. type: Plain text
#: en/git-upload-pack.txt:38
-msgid ""
-"Perform only a single read-write cycle with stdin and stdout. This fits "
-"with the HTTP POST request processing model where a program may read the "
-"request, write a response, and must exit."
+#, priority:100
+msgid "Perform only a single read-write cycle with stdin and stdout. This fits with the HTTP POST request processing model where a program may read the request, write a response, and must exit."
msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:39
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--advertise-refs"
msgstr "--advertise-refs"
#. type: Plain text
#: en/git-upload-pack.txt:43
-msgid ""
-"Only the initial ref advertisement is output, and the program exits "
-"immediately. This fits with the HTTP GET request model, where no request "
-"content is received but a response must be produced."
+#, priority:100
+msgid "Only the initial ref advertisement is output, and the program exits immediately. This fits with the HTTP GET request model, where no request content is received but a response must be produced."
msgstr ""
#. type: Plain text
#: en/git-upload-pack.txt:46
+#, priority:100
msgid "The repository to sync from."
msgstr ""
@@ -64164,40 +54893,37 @@ msgstr "linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-var.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-var(1)"
msgstr "git-var(1)"
#. type: Plain text
#: en/git-var.txt:7
+#, priority:100
msgid "git-var - Show a Git logical variable"
msgstr ""
#. type: Plain text
#: en/git-var.txt:13
-#, no-wrap
+#, no-wrap, priority:100
msgid "'git var' ( -l | <variable> )\n"
msgstr ""
#. type: Plain text
#: en/git-var.txt:17
-#, fuzzy
+#, fuzzy, priority:100
msgid "Prints a Git logical variable."
msgstr "Mostrar una variable l처gica de Git"
#. type: Plain text
#: en/git-var.txt:25
-msgid ""
-"Cause the logical variables to be listed. In addition, all the variables of "
-"the Git configuration file .git/config are listed as well. (However, the "
-"configuration variables listing functionality is deprecated in favor of `git "
-"config -l`.)"
+#, priority:100
+msgid "Cause the logical variables to be listed. In addition, all the variables of the Git configuration file .git/config are listed as well. (However, the configuration variables listing functionality is deprecated in favor of `git config -l`.)"
msgstr ""
#. type: Plain text
#: en/git-var.txt:30
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t$ git var GIT_AUTHOR_IDENT\n"
"\tEric W. Biederman <ebiederm@lnxi.com> 1121223278 -0600\n"
@@ -64205,77 +54931,67 @@ msgstr ""
#. type: Title -
#: en/git-var.txt:33
-#, no-wrap
+#, no-wrap, priority:100
msgid "VARIABLES"
msgstr ""
#. type: Labeled list
#: en/git-var.txt:34
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_AUTHOR_IDENT"
msgstr "GIT_AUTHOR_IDENT"
#. type: Plain text
#: en/git-var.txt:36
+#, priority:100
msgid "The author of a piece of code."
msgstr ""
#. type: Labeled list
#: en/git-var.txt:37
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_COMMITTER_IDENT"
msgstr "GIT_COMMITTER_IDENT"
#. type: Plain text
#: en/git-var.txt:39
+#, priority:100
msgid "The person who put a piece of code into Git."
msgstr ""
#. type: Labeled list
#: en/git-var.txt:40
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_EDITOR"
msgstr "GIT_EDITOR"
#. type: Plain text
#: en/git-var.txt:48
-msgid ""
-"Text editor for use by Git commands. The value is meant to be interpreted "
-"by the shell when it is used. Examples: `~/bin/vi`, "
-"`$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" "
-"--nofork`. The order of preference is the `$GIT_EDITOR` environment "
-"variable, then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, "
-"and then the default chosen at compile time, which is usually 'vi'."
+#, priority:100
+msgid "Text editor for use by Git commands. The value is meant to be interpreted by the shell when it is used. Examples: `~/bin/vi`, `$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" --nofork`. The order of preference is the `$GIT_EDITOR` environment variable, then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, and then the default chosen at compile time, which is usually 'vi'."
msgstr ""
#. type: Plain text
#: en/git-var.txt:50
-#, no-wrap
+#, no-wrap, priority:100
msgid " The build you are using chose '{git-default-editor}' as the default.\n"
msgstr ""
#. type: Labeled list
#: en/git-var.txt:52
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "GIT_PAGER"
msgstr "GIT_PAGER"
#. type: Plain text
#: en/git-var.txt:58
-msgid ""
-"Text viewer for use by Git commands (e.g., 'less'). The value is meant to "
-"be interpreted by the shell. The order of preference is the `$GIT_PAGER` "
-"environment variable, then `core.pager` configuration, then `$PAGER`, and "
-"then the default chosen at compile time (usually 'less')."
+#, priority:100
+msgid "Text viewer for use by Git commands (e.g., 'less'). The value is meant to be interpreted by the shell. The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less')."
msgstr ""
#. type: Plain text
#: en/git-var.txt:60
-#, no-wrap
+#, no-wrap, priority:100
msgid " The build you are using chose '{git-default-pager}' as the default.\n"
msgstr ""
@@ -64287,412 +55003,421 @@ msgstr "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-verify-commit.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-verify-commit(1)"
msgstr "git-verify-commit(1)"
#. type: Plain text
#: en/git-verify-commit.txt:7
+#, priority:100
msgid "git-verify-commit - Check the GPG signature of commits"
msgstr ""
#. type: Plain text
#: en/git-verify-commit.txt:12
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-commit' <commit>...\n"
msgstr ""
#. type: Plain text
#: en/git-verify-commit.txt:16
+#, priority:100
msgid "Validates the GPG signature created by 'git commit -S'."
msgstr ""
#. type: Plain text
#: en/git-verify-commit.txt:22 en/git-verify-tag.txt:22
-msgid ""
-"Print the raw gpg status output to standard error instead of the normal "
-"human-readable output."
+#, priority:100
+msgid "Print the raw gpg status output to standard error instead of the normal human-readable output."
msgstr ""
#. type: Plain text
#: en/git-verify-commit.txt:26
+#, priority:100
msgid "Print the contents of the commit object before validating it."
msgstr ""
#. type: Plain text
#: en/git-verify-commit.txt:29
+#, priority:100
msgid "SHA-1 identifiers of Git commit objects."
msgstr ""
#. type: Title =
#: en/git-verify-pack.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-verify-pack(1)"
msgstr "git-verify-pack(1)"
#. type: Plain text
#: en/git-verify-pack.txt:7
+#, priority:100
msgid "git-verify-pack - Validate packed Git archive files"
msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n"
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..."
#. type: Plain text
#: en/git-verify-pack.txt:20
-msgid ""
-"Reads given idx file for packed Git archive created with the 'git "
-"pack-objects' command and verifies idx file and the corresponding pack file."
+#, priority:100
+msgid "Reads given idx file for packed Git archive created with the 'git pack-objects' command and verifies idx file and the corresponding pack file."
msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:23
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<pack>.idx ..."
msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:25
+#, priority:100
msgid "The idx files to verify."
msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:30
-msgid ""
-"After verifying the pack, show list of objects contained in the pack and a "
-"histogram of delta chain length."
+#, priority:100
+msgid "After verifying the pack, show list of objects contained in the pack and a histogram of delta chain length."
msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--stat-only"
msgstr "--stat-only"
#. type: Plain text
#: en/git-verify-pack.txt:35
-msgid ""
-"Do not verify the pack contents; only show the histogram of delta chain "
-"length. With `--verbose`, list of objects is also shown."
+#, priority:100
+msgid "Do not verify the pack contents; only show the histogram of delta chain length. With `--verbose`, list of objects is also shown."
msgstr ""
#. type: Title -
#: en/git-verify-pack.txt:40
-#, no-wrap
+#, no-wrap, priority:100
msgid "OUTPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:42
+#, priority:100
msgid "When specifying the -v option the format used is:"
msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tSHA-1 type size size-in-packfile offset-in-packfile\n"
msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:46
+#, priority:100
msgid "for objects that are not deltified in the pack, and"
msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:48
-#, no-wrap
+#, no-wrap, priority:100
msgid "\tSHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1\n"
msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:50
+#, priority:100
msgid "for objects that are deltified."
msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
#. type: Plain text
#: en/git-verify-tag.txt:7
+#, priority:100
msgid "git-verify-tag - Check the GPG signature of tags"
msgstr ""
#. type: Plain text
#: en/git-verify-tag.txt:12
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-tag' [--format=<format>] <tag>...\n"
msgstr ""
#. type: Plain text
#: en/git-verify-tag.txt:16
+#, priority:100
msgid "Validates the gpg signature created by 'git tag'."
msgstr ""
#. type: Plain text
#: en/git-verify-tag.txt:26
+#, priority:100
msgid "Print the contents of the tag object before validating it."
msgstr ""
#. type: Labeled list
#: en/git-verify-tag.txt:27
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<tag>..."
msgstr ""
#. type: Plain text
#: en/git-verify-tag.txt:29
+#, priority:100
msgid "SHA-1 identifiers of Git tag objects."
msgstr ""
#. type: Title =
#: en/git-web--browse.txt:2
-#, no-wrap
+#, no-wrap, priority:100
msgid "git-web{litdd}browse(1)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:7
+#, priority:100
msgid "git-web--browse - Git helper script to launch a web browser"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:12
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git web{litdd}browse' [<options>] <url|file>...\n"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:19
-msgid ""
-"This script tries, as much as possible, to display the URLs and FILEs that "
-"are passed as arguments, as HTML pages in new tabs on an already opened web "
-"browser."
+#, priority:100
+msgid "This script tries, as much as possible, to display the URLs and FILEs that are passed as arguments, as HTML pages in new tabs on an already opened web browser."
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:21
+#, priority:100
msgid "The following browsers (or commands) are currently supported:"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:23
+#, priority:100
msgid "firefox (this is the default under X Window when not using KDE)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:24
+#, priority:100
msgid "iceweasel"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:25
+#, priority:100
msgid "seamonkey"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:26
+#, priority:100
msgid "iceape"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:27
+#, priority:100
msgid "chromium (also supported as chromium-browser)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:28
+#, priority:100
msgid "google-chrome (also supported as chrome)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:29
+#, priority:100
msgid "konqueror (this is the default under KDE, see 'Note about konqueror' below)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:30
+#, priority:100
msgid "opera"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:31
+#, priority:100
msgid "w3m (this is the default outside graphical environments)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:32
+#, priority:100
msgid "elinks"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:33
+#, priority:100
msgid "links"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:34
+#, priority:100
msgid "lynx"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:35
+#, priority:100
msgid "dillo"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:36
+#, priority:100
msgid "open (this is the default under Mac OS X GUI)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:37
+#, priority:100
msgid "start (this is the default under MinGW)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:38
+#, priority:100
msgid "cygstart (this is the default under Cygwin)"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:39
+#, priority:100
msgid "xdg-open"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:41
+#, priority:100
msgid "Custom commands may also be specified."
msgstr ""
#. type: Labeled list
#: en/git-web--browse.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "-b <browser>"
msgstr ""
#. type: Labeled list
#: en/git-web--browse.txt:45
-#, no-wrap
+#, no-wrap, priority:100
msgid "--browser=<browser>"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:48
+#, priority:100
msgid "Use the specified browser. It must be in the list of supported browsers."
msgstr ""
#. type: Labeled list
#: en/git-web--browse.txt:49
-#, no-wrap
+#, no-wrap, priority:100
msgid "-t <browser>"
msgstr ""
#. type: Labeled list
#: en/git-web--browse.txt:50
-#, no-wrap
+#, no-wrap, priority:100
msgid "--tool=<browser>"
msgstr ""
#. type: Labeled list
#: en/git-web--browse.txt:53
-#, no-wrap
+#, no-wrap, priority:100
msgid "-c <conf.var>"
msgstr ""
#. type: Labeled list
#: en/git-web--browse.txt:54
-#, no-wrap
+#, no-wrap, priority:100
msgid "--config=<conf.var>"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:57
-msgid ""
-"CONF.VAR is looked up in the Git config files. If it's set, then its value "
-"specifies the browser that should be used."
+#, priority:100
+msgid "CONF.VAR is looked up in the Git config files. If it's set, then its value specifies the browser that should be used."
msgstr ""
#. type: Title ~
#: en/git-web--browse.txt:62
-#, no-wrap
+#, no-wrap, priority:100
msgid "CONF.VAR (from -c option) and web.browser"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:67
-msgid ""
-"The web browser can be specified using a configuration variable passed with "
-"the -c (or --config) command-line option, or the `web.browser` configuration "
-"variable if the former is not used."
+#, priority:100
+msgid "The web browser can be specified using a configuration variable passed with the -c (or --config) command-line option, or the `web.browser` configuration variable if the former is not used."
msgstr ""
#. type: Title ~
#: en/git-web--browse.txt:69
-#, no-wrap
+#, no-wrap, priority:100
msgid "browser.<tool>.path"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:76
-msgid ""
-"You can explicitly provide a full path to your preferred browser by setting "
-"the configuration variable `browser.<tool>.path`. For example, you can "
-"configure the absolute path to firefox by setting "
-"'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool "
-"is available in PATH."
+#, priority:100
+msgid "You can explicitly provide a full path to your preferred browser by setting the configuration variable `browser.<tool>.path`. For example, you can configure the absolute path to firefox by setting 'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool is available in PATH."
msgstr ""
#. type: Title ~
#: en/git-web--browse.txt:78
-#, no-wrap
+#, no-wrap, priority:100
msgid "browser.<tool>.cmd"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:86
-msgid ""
-"When the browser, specified by options or configuration variables, is not "
-"among the supported ones, then the corresponding `browser.<tool>.cmd` "
-"configuration variable will be looked up. If this variable exists then 'git "
-"web{litdd}browse' will treat the specified tool as a custom command and will "
-"use a shell eval to run the command with the URLs passed as arguments."
+#, priority:100
+msgid "When the browser, specified by options or configuration variables, is not among the supported ones, then the corresponding `browser.<tool>.cmd` configuration variable will be looked up. If this variable exists then 'git web{litdd}browse' will treat the specified tool as a custom command and will use a shell eval to run the command with the URLs passed as arguments."
msgstr ""
#. type: Title -
#: en/git-web--browse.txt:88
-#, no-wrap
+#, no-wrap, priority:100
msgid "NOTE ABOUT KONQUEROR"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:93
-msgid ""
-"When 'konqueror' is specified by a command-line option or a configuration "
-"variable, we launch 'kfmclient' to try to open the HTML man page on an "
-"already opened konqueror in a new tab if possible."
+#, priority:100
+msgid "When 'konqueror' is specified by a command-line option or a configuration variable, we launch 'kfmclient' to try to open the HTML man page on an already opened konqueror in a new tab if possible."
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:97
-msgid ""
-"For consistency, we also try such a trick if 'browser.konqueror.path' is set "
-"to something like `A_PATH_TO/konqueror`. That means we will try to launch "
-"`A_PATH_TO/kfmclient` instead."
+#, priority:100
+msgid "For consistency, we also try such a trick if 'browser.konqueror.path' is set to something like `A_PATH_TO/konqueror`. That means we will try to launch `A_PATH_TO/kfmclient` instead."
msgstr ""
#. type: delimited block -
#: en/git-web--browse.txt:104
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t[web]\n"
"\t\tbrowser = konq\n"
@@ -64700,7 +55425,7 @@ msgstr ""
#. type: delimited block -
#: en/git-web--browse.txt:107
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"\t[browser \"konq\"]\n"
"\t\tcmd = A_PATH_TO/konqueror\n"
@@ -64708,106 +55433,99 @@ msgstr ""
#. type: Title ~
#: en/git-web--browse.txt:110
-#, no-wrap
+#, no-wrap, priority:100
msgid "Note about git-config --global"
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:114
-msgid ""
-"Note that these configuration variables should probably be set using the "
-"`--global` flag, for example like this:"
+#, priority:100
+msgid "Note that these configuration variables should probably be set using the `--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
#: en/git-web--browse.txt:117
-#, no-wrap
+#, no-wrap, priority:100
msgid "$ git config --global web.browser firefox\n"
msgstr ""
#. type: Title =
#: en/git-whatchanged.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-whatchanged(1)"
msgstr "git-whatchanged(1)"
#. type: Plain text
#: en/git-whatchanged.txt:7
+#, priority:100
msgid "git-whatchanged - Show logs with difference each commit introduces"
msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:13
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git whatchanged' <option>...\n"
msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:18
+#, priority:100
msgid "Shows commit logs and diff output each commit introduces."
msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:22
-msgid ""
-"New users are encouraged to use linkgit:git-log[1] instead. The "
-"`whatchanged` command is essentially the same as linkgit:git-log[1] but "
-"defaults to show the raw format diff output and to skip merges."
+#, priority:100
+msgid "New users are encouraged to use linkgit:git-log[1] instead. The `whatchanged` command is essentially the same as linkgit:git-log[1] but defaults to show the raw format diff output and to skip merges."
msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:26
-msgid ""
-"The command is kept primarily for historical reasons; fingers of many people "
-"who learned Git long before `git log` was invented by reading Linux kernel "
-"mailing list are trained to type it."
+#, priority:100
+msgid "The command is kept primarily for historical reasons; fingers of many people who learned Git long before `git log` was invented by reading Linux kernel mailing list are trained to type it."
msgstr ""
#. type: Labeled list
#: en/git-whatchanged.txt:30
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`"
msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:34
-msgid ""
-"Show as patches the commits since version 'v2.6.12' that changed any file in "
-"the include/scsi or drivers/scsi subdirectories"
+#, priority:100
+msgid "Show as patches the commits since version 'v2.6.12' that changed any file in the include/scsi or drivers/scsi subdirectories"
msgstr ""
#. type: Labeled list
#: en/git-whatchanged.txt:35
-#, no-wrap
+#, no-wrap, priority:100
msgid "`git whatchanged --since=\"2 weeks ago\" -- gitk`"
msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:40
-msgid ""
-"Show the changes during the last two weeks to the file 'gitk'. The \"--\" "
-"is necessary to avoid confusion with the *branch* named 'gitk'"
+#, priority:100
+msgid "Show the changes during the last two weeks to the file 'gitk'. The \"--\" is necessary to avoid confusion with the *branch* named 'gitk'"
msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "git-worktree(1)"
msgstr "git-worktree(1)"
#. type: Plain text
#: en/git-worktree.txt:7
+#, priority:240
msgid "git-worktree - Manage multiple working trees"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:19
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] "
-"<path> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n"
"'git worktree list' [--porcelain]\n"
"'git worktree lock' [--reason <string>] <worktree>\n"
"'git worktree move' <worktree> <new-path>\n"
@@ -64818,533 +55536,409 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:24
+#, priority:240
msgid "Manage multiple working trees attached to the same repository."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:32
-msgid ""
-"A git repository can support multiple working trees, allowing you to check "
-"out more than one branch at a time. With `git worktree add` a new working "
-"tree is associated with the repository. This new working tree is called a "
-"\"linked working tree\" as opposed to the \"main working tree\" prepared by "
-"\"git init\" or \"git clone\". A repository has one main working tree (if "
-"it's not a bare repository) and zero or more linked working trees. When you "
-"are done with a linked working tree, remove it with `git worktree remove`."
+#, priority:240
+msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by \"git init\" or \"git clone\". A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:39
-msgid ""
-"If a working tree is deleted without using `git worktree remove`, then its "
-"associated administrative files, which reside in the repository (see "
-"\"DETAILS\" below), will eventually be removed automatically (see "
-"`gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git "
-"worktree prune` in the main or any linked working tree to clean up any stale "
-"administrative files."
+#, priority:240
+msgid "If a working tree is deleted without using `git worktree remove`, then its associated administrative files, which reside in the repository (see \"DETAILS\" below), will eventually be removed automatically (see `gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree prune` in the main or any linked working tree to clean up any stale administrative files."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:44
-msgid ""
-"If a linked working tree is stored on a portable device or network share "
-"which is not always mounted, you can prevent its administrative files from "
-"being pruned by issuing the `git worktree lock` command, optionally "
-"specifying `--reason` to explain why the working tree is locked."
+#, priority:240
+msgid "If a linked working tree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from being pruned by issuing the `git worktree lock` command, optionally specifying `--reason` to explain why the working tree is locked."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:47
-#, no-wrap
+#, no-wrap, priority:240
msgid "add <path> [<commit-ish>]"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:53
-msgid ""
-"Create `<path>` and checkout `<commit-ish>` into it. The new working "
-"directory is linked to the current repository, sharing everything except "
-"working directory specific files such as HEAD, index, etc. `-` may also be "
-"specified as `<commit-ish>`; it is synonymous with `@{-1}`."
+#, priority:240
+msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as HEAD, index, etc. `-` may also be specified as `<commit-ish>`; it is synonymous with `@{-1}`."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:58
-msgid ""
-"If <commit-ish> is a branch name (call it `<branch>`) and is not found, and "
-"neither `-b` nor `-B` nor `--detach` are used, but there does exist a "
-"tracking branch in exactly one remote (call it `<remote>`) with a matching "
-"name, treat as equivalent to:"
+#, priority:240
+msgid "If <commit-ish> is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to:"
msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:61
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git worktree add --track -b <branch> <path> <remote>/<branch>\n"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:80
-msgid ""
-"If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, "
-"then, as a convenience, the new worktree is associated with a branch (call "
-"it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't "
-"exist, a new branch based on HEAD is automatically created as if `-b "
-"<branch>` was given. If `<branch>` does exist, it will be checked out in "
-"the new worktree, if it's not checked out anywhere else, otherwise the "
-"command will refuse to create the worktree (unless `--force` is used)."
+#, priority:240
+msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new worktree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't exist, a new branch based on HEAD is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be checked out in the new worktree, if it's not checked out anywhere else, otherwise the command will refuse to create the worktree (unless `--force` is used)."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:87
-msgid ""
-"List details of each worktree. The main worktree is listed first, followed "
-"by each of the linked worktrees. The output details include if the worktree "
-"is bare, the revision currently checked out, and the branch currently "
-"checked out (or 'detached HEAD' if none)."
+#, priority:240
+msgid "List details of each worktree. The main worktree is listed first, followed by each of the linked worktrees. The output details include if the worktree is bare, the revision currently checked out, and the branch currently checked out (or 'detached HEAD' if none)."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:88
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "lock"
msgstr "lock"
#. type: Plain text
#: en/git-worktree.txt:95
-msgid ""
-"If a working tree is on a portable device or network share which is not "
-"always mounted, lock it to prevent its administrative files from being "
-"pruned automatically. This also prevents it from being moved or "
-"deleted. Optionally, specify a reason for the lock with `--reason`."
+#, priority:240
+msgid "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically. This also prevents it from being moved or deleted. Optionally, specify a reason for the lock with `--reason`."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:96
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "move"
msgstr "move"
#. type: Plain text
#: en/git-worktree.txt:100
-msgid ""
-"Move a working tree to a new location. Note that the main working tree or "
-"linked working trees containing submodules cannot be moved."
+#, priority:240
+msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:104
+#, priority:240
msgid "Prune working tree information in $GIT_DIR/worktrees."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:111
-msgid ""
-"Remove a working tree. Only clean working trees (no untracked files and no "
-"modification in tracked files) can be removed. Unclean working trees or ones "
-"with submodules can be removed with `--force`. The main working tree cannot "
-"be removed."
+#, priority:240
+msgid "Remove a working tree. Only clean working trees (no untracked files and no modification in tracked files) can be removed. Unclean working trees or ones with submodules can be removed with `--force`. The main working tree cannot be removed."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:112
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "unlock"
msgstr "unlock"
#. type: Plain text
#: en/git-worktree.txt:115
+#, priority:240
msgid "Unlock a working tree, allowing it to be pruned, moved or deleted."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:127
-msgid ""
-"By default, `add` refuses to create a new working tree when `<commit-ish>` "
-"is a branch name and is already checked out by another working tree, or if "
-"`<path>` is already assigned to some working tree but is missing (for "
-"instance, if `<path>` was deleted manually). This option overrides these "
-"safeguards. To add a missing but locked working tree path, specify `--force` "
-"twice."
+#, priority:240
+msgid "By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by another working tree, or if `<path>` is already assigned to some working tree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify `--force` twice."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:130
-msgid ""
-"`move` refuses to move a locked working tree unless `--force` is specified "
-"twice."
+#, priority:240
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:133
-msgid ""
-"`remove` refuses to remove an unclean working tree unless `--force` is "
-"used. To remove a locked working tree, specify `--force` twice."
+#, priority:240
+msgid "`remove` refuses to remove an unclean working tree unless `--force` is used. To remove a locked working tree, specify `--force` twice."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:134
-#, no-wrap
+#, no-wrap, priority:240
msgid "-b <new-branch>"
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:135
-#, no-wrap
+#, no-wrap, priority:240
msgid "-B <new-branch>"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:142
-msgid ""
-"With `add`, create a new branch named `<new-branch>` starting at "
-"`<commit-ish>`, and check out `<new-branch>` into the new working tree. If "
-"`<commit-ish>` is omitted, it defaults to HEAD. By default, `-b` refuses to "
-"create a new branch if it already exists. `-B` overrides this safeguard, "
-"resetting `<new-branch>` to `<commit-ish>`."
+#, priority:240
+msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to HEAD. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:146
-msgid ""
-"With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in "
-"linkgit:git-checkout[1]."
+#, priority:240
+msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:147
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
#. type: Plain text
#: en/git-worktree.txt:152
-msgid ""
-"By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be "
-"used to suppress checkout in order to make customizations, such as "
-"configuring sparse-checkout. See \"Sparse checkout\" in "
-"linkgit:git-read-tree[1]."
+#, priority:240
+msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:153
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--[no-]guess-remote"
msgstr "--[no-]guess-remote"
#. type: Plain text
#: en/git-worktree.txt:159
-msgid ""
-"With `worktree add <path>`, without `<commit-ish>`, instead of creating a "
-"new branch from HEAD, if there exists a tracking branch in exactly one "
-"remote matching the basename of `<path>`, base the new branch on the "
-"remote-tracking branch, and mark the remote-tracking branch as \"upstream\" "
-"from the new branch."
+#, priority:240
+msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:162
-msgid ""
-"This can also be set up as the default behaviour by using the "
-"`worktree.guessRemote` config option."
+#, priority:240
+msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:163
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--[no-]track"
msgstr "--[no-]track"
#. type: Plain text
#: en/git-worktree.txt:168
-msgid ""
-"When creating a new branch, if `<commit-ish>` is a branch, mark it as "
-"\"upstream\" from the new branch. This is the default if `<commit-ish>` is "
-"a remote-tracking branch. See \"--track\" in linkgit:git-branch[1] for "
-"details."
+#, priority:240
+msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See \"--track\" in linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:169
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--lock"
msgstr "--lock"
#. type: Plain text
#: en/git-worktree.txt:173
-msgid ""
-"Keep the working tree locked after creation. This is the equivalent of `git "
-"worktree lock` after `git worktree add`, but without race condition."
+#, priority:240
+msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:178
+#, priority:240
msgid "With `prune`, do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:183
-msgid ""
-"With `list`, output in an easy-to-parse format for scripts. This format "
-"will remain stable across Git versions and regardless of user "
-"configuration. See below for details."
+#, priority:240
+msgid "With `list`, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:187
+#, priority:240
msgid "With 'add', suppress feedback messages."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:191
+#, priority:240
msgid "With `prune`, report all removals."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:194
+#, priority:240
msgid "With `prune`, only expire unused working trees older than <time>."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:195
-#, no-wrap
+#, no-wrap, priority:240
msgid "--reason <string>"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:197
+#, priority:240
msgid "With `lock`, an explanation why the working tree is locked."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:198
-#, no-wrap
+#, no-wrap, priority:240
msgid "<worktree>"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:201
+#, priority:240
msgid "Working trees can be identified by path, either relative or absolute."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:206
-msgid ""
-"If the last path components in the working tree's path is unique among "
-"working trees, it can be used to identify worktrees. For example if you only "
-"have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then "
-"\"ghi\" or \"def/ghi\" is enough to point to the former working tree."
+#, priority:240
+msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
msgstr ""
#. type: Title -
#: en/git-worktree.txt:208
-#, no-wrap
+#, no-wrap, priority:240
msgid "REFS"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:213
-msgid ""
-"In multiple working trees, some refs may be shared between all working "
-"trees, some refs are local. One example is HEAD is different for all working "
-"trees. This section is about the sharing rules and how to access refs of one "
-"working tree from another."
+#, priority:240
+msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:219
-msgid ""
-"In general, all pseudo refs are per working tree and all refs starting with "
-"\"refs/\" are shared. Pseudo refs are ones like HEAD which are directly "
-"under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to "
-"this: refs inside refs/bisect and refs/worktree is not shared."
+#, priority:240
+msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:224
-msgid ""
-"Refs that are per working tree can still be accessed from another working "
-"tree via two special paths, main-worktree and worktrees. The former gives "
-"access to per-worktree refs of the main working tree, while the latter to "
-"all linked working trees."
+#, priority:240
+msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:231
-msgid ""
-"For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to "
-"the same value as the main working tree's HEAD and refs/bisect/good "
-"respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad "
-"are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and "
-"GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
+#, priority:240
+msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:235
-msgid ""
-"To access refs, it's best not to look inside GIT_DIR directly. Instead use "
-"commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which "
-"will handle refs correctly."
+#, priority:240
+msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:242
-msgid ""
-"By default, the repository \"config\" file is shared across all working "
-"trees. If the config variables `core.bare` or `core.worktree` are already "
-"present in the config file, they will be applied to the main working trees "
-"only."
+#, priority:240
+msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:245
-msgid ""
-"In order to have configuration specific to working trees, you can turn on "
-"\"worktreeConfig\" extension, e.g.:"
+#, priority:240
+msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:248
-#, no-wrap
+#, no-wrap, priority:240
msgid "$ git config extensions.worktreeConfig true\n"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:254
-msgid ""
-"In this mode, specific configuration stays in the path pointed by `git "
-"rev-parse --git-path config.worktree`. You can add or update configuration "
-"in this file with `git config --worktree`. Older Git versions will refuse to "
-"access repositories with this extension."
+#, priority:240
+msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:260
-msgid ""
-"Note that in this file, the exception for `core.bare` and `core.worktree` is "
-"gone. If you have them in $GIT_DIR/config before, you must move them to the "
-"`config.worktree` of the main working tree. You may also take this "
-"opportunity to review and move other configuration that you do not want to "
-"share to all working trees:"
+#, priority:240
+msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:262
+#, priority:240
msgid "`core.worktree` and `core.bare` should never be shared"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:265
-msgid ""
-"`core.sparseCheckout` is recommended per working tree, unless you are sure "
-"you always use sparse checkout for all working trees."
+#, priority:240
+msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
msgstr ""
#. type: Title -
#: en/git-worktree.txt:267
-#, no-wrap
+#, no-wrap, priority:240
msgid "DETAILS"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:276
-msgid ""
-"Each linked working tree has a private sub-directory in the repository's "
-"$GIT_DIR/worktrees directory. The private sub-directory's name is usually "
-"the base name of the linked working tree's path, possibly appended with a "
-"number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the "
-"command `git worktree add /path/other/test-next next` creates the linked "
-"working tree in `/path/other/test-next` and also creates a "
-"`$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` "
-"if `test-next` is already taken)."
+#, priority:240
+msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:282
-msgid ""
-"Within a linked working tree, $GIT_DIR is set to point to this private "
-"directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and "
-"$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR "
-"(e.g. `/path/main/.git`). These settings are made in a `.git` file located "
-"at the top directory of the linked working tree."
+#, priority:240
+msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:292
-msgid ""
-"Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or "
-"$GIT_COMMON_DIR depending on the path. For example, in the linked working "
-"tree `git rev-parse --git-path HEAD` returns "
-"`/path/main/.git/worktrees/test-next/HEAD` (not "
-"`/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git "
-"rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns "
-"`/path/main/.git/refs/heads/master`, since refs are shared across all "
-"working trees, except refs/bisect and refs/worktree."
+#, priority:240
+msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:297
-msgid ""
-"See linkgit:gitrepository-layout[5] for more information. The rule of thumb "
-"is do not make any assumption about whether a path belongs to $GIT_DIR or "
-"$GIT_COMMON_DIR when you need to directly access something inside "
-"$GIT_DIR. Use `git rev-parse --git-path` to get the final path."
+#, priority:240
+msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:304
-msgid ""
-"If you manually move a linked working tree, you need to update the 'gitdir' "
-"file in the entry's directory. For example, if a linked working tree is "
-"moved to `/newpath/test-next` and its `.git` file points to "
-"`/path/main/.git/worktrees/test-next`, then update "
-"`/path/main/.git/worktrees/test-next/gitdir` to reference "
-"`/newpath/test-next` instead."
+#, priority:240
+msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:315
-msgid ""
-"To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful "
-"in some situations, such as when the entry's working tree is stored on a "
-"portable device), use the `git worktree lock` command, which adds a file "
-"named 'locked' to the entry's directory. The file contains the reason in "
-"plain text. For example, if a linked working tree's `.git` file points to "
-"`/path/main/.git/worktrees/test-next` then a file named "
-"`/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` "
-"entry from being pruned. See linkgit:gitrepository-layout[5] for details."
+#, priority:240
+msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:318
-msgid ""
-"When extensions.worktreeConfig is enabled, the config file "
-"`.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
+#, priority:240
+msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
msgstr ""
#. type: Title -
#: en/git-worktree.txt:320
-#, no-wrap
+#, no-wrap, priority:240
msgid "LIST OUTPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:323
-msgid ""
-"The worktree list command has two output formats. The default format shows "
-"the details on a single line with columns. For example:"
+#, priority:240
+msgid "The worktree list command has two output formats. The default format shows the details on a single line with columns. For example:"
msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:329
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git worktree list\n"
"/path/to/bare-source (bare)\n"
@@ -65354,23 +55948,19 @@ msgstr ""
#. type: Title ~
#: en/git-worktree.txt:332
-#, no-wrap
+#, no-wrap, priority:240
msgid "Porcelain Format"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:338
-msgid ""
-"The porcelain format has a line per attribute. Attributes are listed with a "
-"label and value separated by a single space. Boolean attributes (like "
-"'bare' and 'detached') are listed as a label only, and are only present if "
-"and only if the value is true. The first attribute of a worktree is always "
-"`worktree`, an empty line indicates the end of the record. For example:"
+#, priority:240
+msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true. The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record. For example:"
msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:343
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"$ git worktree list --porcelain\n"
"worktree /path/to/bare-source\n"
@@ -65379,7 +55969,7 @@ msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:347
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"worktree /path/to/linked-worktree\n"
"HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n"
@@ -65388,7 +55978,7 @@ msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:351
-#, no-wrap
+#, no-wrap, priority:240
msgid ""
"worktree /path/to/other-linked-worktree\n"
"HEAD 1234abc1234abc1234abc1234abc1234abc1234a\n"
@@ -65397,20 +55987,13 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:364
-msgid ""
-"You are in the middle of a refactoring session and your boss comes in and "
-"demands that you fix something immediately. You might typically use "
-"linkgit:git-stash[1] to store your changes away temporarily, however, your "
-"working tree is in such a state of disarray (with new, moved, and removed "
-"files, and other bits and pieces strewn around) that you don't want to risk "
-"disturbing any of it. Instead, you create a temporary linked working tree to "
-"make the emergency fix, remove it when done, and then resume your earlier "
-"refactoring session."
+#, priority:240
+msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:372
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git worktree add -b emergency-fix ../temp master\n"
"$ pushd ../temp\n"
@@ -65422,1663 +56005,1357 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:379
-msgid ""
-"Multiple checkout in general is still experimental, and the support for "
-"submodules is incomplete. It is NOT recommended to make multiple checkouts "
-"of a superproject."
+#, priority:240
+msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
#. type: Plain text
#: en/git-write-tree.txt:7
+#, priority:100
msgid "git-write-tree - Create a tree object from the current index"
msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:13
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
#. type: Plain text
#: en/git-write-tree.txt:18
-msgid ""
-"Creates a tree object using the current index. The name of the new tree "
-"object is printed to standard output."
+#, priority:100
+msgid "Creates a tree object using the current index. The name of the new tree object is printed to standard output."
msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:20
+#, priority:100
msgid "The index must be in a fully merged state."
msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:26
-msgid ""
-"Conceptually, 'git write-tree' sync()s the current index contents into a set "
-"of tree files. In order to have that match what is actually in your "
-"directory right now, you need to have done a 'git update-index' phase before "
-"you did the 'git write-tree'."
+#, priority:100
+msgid "Conceptually, 'git write-tree' sync()s the current index contents into a set of tree files. In order to have that match what is actually in your directory right now, you need to have done a 'git update-index' phase before you did the 'git write-tree'."
msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "--missing-ok"
msgstr "--missing-ok"
#. type: Plain text
#: en/git-write-tree.txt:34
-msgid ""
-"Normally 'git write-tree' ensures that the objects referenced by the "
-"directory exist in the object database. This option disables this check."
+#, priority:100
+msgid "Normally 'git write-tree' ensures that the objects referenced by the directory exist in the object database. This option disables this check."
msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:39
-msgid ""
-"Writes a tree object that represents a subdirectory `<prefix>`. This can be "
-"used to write the tree object for a subproject that is in the named "
-"subdirectory."
+#, priority:100
+msgid "Writes a tree object that represents a subdirectory `<prefix>`. This can be used to write the tree object for a subproject that is in the named subdirectory."
msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, no-wrap
#, ignore-same, no-wrap, priority:100
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
+#, priority:100
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap
+#, no-wrap, priority:100
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-msgid ""
-"linkgit:gittutorial[7], linkgit:gittutorial-2[7], "
-"linkgit:gitcvs-migration[7], linkgit:giteveryday[7], "
-"link:user-manual.html[The Git User's Manual]"
+#, priority:100
+msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-msgid ""
-"Via the alternates mechanism, a <<def_repository,repository>> can inherit "
-"part of its <<def_object_database,object database>> from another object "
-"database, which is called an \"alternate\"."
+#, priority:100
+msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-msgid ""
-"A bare repository is normally an appropriately named "
-"<<def_directory,directory>> with a `.git` suffix that does not have a "
-"locally checked-out copy of any of the files under revision control. That "
-"is, all of the Git administrative and control files that would normally be "
-"present in the hidden `.git` sub-directory are directly present in the "
-"`repository.git` directory instead, and no other files are present and "
-"checked out. Usually publishers of public repositories make bare "
-"repositories available."
+#, priority:100
+msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
+#, priority:100
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-msgid ""
-"A \"branch\" is an active line of development. The most recent "
-"<<def_commit,commit>> on a branch is referred to as the tip of that branch. "
-"The tip of the branch is referenced by a branch <<def_head,head>>, which "
-"moves forward as additional development is done on the branch. A single Git "
-"<<def_repository,repository>> can track an arbitrary number of branches, but "
-"your <<def_working_tree,working tree>> is associated with just one of them "
-"(the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to "
-"that branch."
+#, priority:100
+msgid "A \"branch\" is an active line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
+#, priority:100
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-msgid ""
-"A list of objects, where each <<def_object,object>> in the list contains a "
-"reference to its successor (for example, the successor of a "
-"<<def_commit,commit>> could be one of its <<def_parent,parents>>)."
+#, priority:100
+msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-msgid ""
-"BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not "
-"store changes, but states, it really does not make sense to use the term "
-"\"changesets\" with Git."
+#, priority:100
+msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-msgid ""
-"The action of updating all or part of the <<def_working_tree,working tree>> "
-"with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the "
-"<<def_object_database,object database>>, and updating the "
-"<<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been "
-"pointed at a new <<def_branch,branch>>."
+#, priority:100
+msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-msgid ""
-"In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of "
-"changes out of a series of changes (typically commits) and record them as a "
-"new series of changes on top of a different codebase. In Git, this is "
-"performed by the \"git cherry-pick\" command to extract the change "
-"introduced by an existing <<def_commit,commit>> and to record it based on "
-"the tip of the current <<def_branch,branch>> as a new commit."
+#, priority:100
+msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-msgid ""
-"A <<def_working_tree,working tree>> is clean, if it corresponds to the "
-"<<def_revision,revision>> referenced by the current <<def_head,head>>. Also "
-"see \"<<def_dirty,dirty>>\"."
+#, priority:100
+msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-msgid ""
-"As a noun: A single point in the Git history; the entire history of a "
-"project is represented as a set of interrelated commits. The word "
-"\"commit\" is often used by Git in the same places other revision control "
-"systems use the words \"revision\" or \"version\". Also used as a short "
-"hand for <<def_commit_object,commit object>>."
+#, priority:100
+msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-msgid ""
-"As a verb: The action of storing a new snapshot of the project's state in "
-"the Git history, by creating a new commit representing the current state of "
-"the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new "
-"commit."
+#, priority:100
+msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-msgid ""
-"An <<def_object,object>> which contains the information about a particular "
-"<<def_revision,revision>>, such as <<def_parent,parents>>, committer, "
-"author, date and the <<def_tree_object,tree object>> which corresponds to "
-"the top <<def_directory,directory>> of the stored revision."
+#, priority:100
+msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-msgid ""
-"A <<def_commit_object,commit object>> or an <<def_object,object>> that can "
-"be recursively dereferenced to a commit object. The following are all "
-"commit-ishes: a commit object, a <<def_tag_object,tag object>> that points "
-"to a commit object, a tag object that points to a tag object that points to "
-"a commit object, etc."
+#, priority:100
+msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-msgid ""
-"Fundamental data structures and utilities of Git. Exposes only limited "
-"source code management tools."
+#, priority:100
+msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-msgid ""
-"Directed acyclic graph. The <<def_commit_object,commit objects>> form a "
-"directed acyclic graph, because they have parents (directed), and the graph "
-"of commit objects is acyclic (there is no <<def_chain,chain>> which begins "
-"and ends with the same <<def_object,object>>)."
+#, priority:100
+msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-msgid ""
-"An <<def_unreachable_object,unreachable object>> which is not "
-"<<def_reachable,reachable>> even from other unreachable objects; a dangling "
-"object has no references to it from any reference or <<def_object,object>> "
-"in the <<def_repository,repository>>."
+#, priority:100
+msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-msgid ""
-"Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, "
-"and commands that operate on the history HEAD represents operate on the "
-"history leading to the tip of the branch the HEAD points at. However, Git "
-"also allows you to <<def_checkout,check out>> an arbitrary "
-"<<def_commit,commit>> that isn't necessarily the tip of any particular "
-"branch. The HEAD in such a state is called \"detached\"."
+#, priority:100
+msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-msgid ""
-"Note that commands that operate on the history of the current branch "
-"(e.g. `git commit` to build a new history on top of it) still work while the "
-"HEAD is detached. They update the HEAD to point at the tip of the updated "
-"history without affecting any branch. Commands that update or inquire "
-"information _about_ the current branch (e.g. `git branch --set-upstream-to` "
-"that sets what remote-tracking branch the current branch integrates with) "
-"obviously do not work, as there is no (real) current branch to ask about in "
-"this state."
+#, priority:100
+msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
+#, priority:100
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-msgid ""
-"A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains "
-"modifications which have not been <<def_commit,committed>> to the current "
-"<<def_branch,branch>>."
+#, priority:100
+msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-msgid ""
-"An evil merge is a <<def_merge,merge>> that introduces changes that do not "
-"appear in any <<def_parent,parent>>."
+#, priority:100
+msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-msgid ""
-"A fast-forward is a special type of <<def_merge,merge>> where you have a "
-"<<def_revision,revision>> and you are \"merging\" another "
-"<<def_branch,branch>>'s changes that happen to be a descendant of what you "
-"have. In such a case, you do not make a new <<def_merge,merge>> "
-"<<def_commit,commit>> but instead just update to his revision. This will "
-"happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> "
-"of a remote <<def_repository,repository>>."
+#, priority:100
+msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-msgid ""
-"Fetching a <<def_branch,branch>> means to get the branch's "
-"<<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to "
-"find out which objects are missing from the local "
-"<<def_object_database,object database>>, and to get them, too. See also "
-"linkgit:git-fetch[1]."
+#, priority:100
+msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-msgid ""
-"Linus Torvalds originally designed Git to be a user space file system, "
-"i.e. the infrastructure to hold files and directories. That ensured the "
-"efficiency and speed of Git."
+#, priority:100
+msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
+#, priority:100
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-msgid ""
-"A plain file `.git` at the root of a working tree that points at the "
-"directory that is the real repository."
+#, priority:100
+msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-msgid ""
-"Grafts enables two otherwise different lines of development to be joined "
-"together by recording fake ancestry information for commits. This way you "
-"can make Git pretend the set of <<def_parent,parents>> a "
-"<<def_commit,commit>> has is different from what was recorded when the "
-"commit was created. Configured via the `.git/info/grafts` file."
+#, priority:100
+msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-msgid ""
-"Note that the grafts mechanism is outdated and can lead to problems "
-"transferring objects between repositories; see linkgit:git-replace[1] for a "
-"more flexible and robust system to do the same thing."
+#, priority:100
+msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
+#, priority:100
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-msgid ""
-"A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a "
-"<<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` "
-"directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
+#, priority:100
+msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-msgid ""
-"The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, "
-"working tree>> is normally derived from the state of the tree referred to by "
-"HEAD. HEAD is a reference to one of the <<def_head,heads>> in your "
-"repository, except when using a <<def_detached_HEAD,detached HEAD>>, in "
-"which case it directly references an arbitrary commit."
+#, priority:100
+msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
+#, priority:100
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-msgid ""
-"During the normal execution of several Git commands, call-outs are made to "
-"optional scripts that allow a developer to add functionality or "
-"checking. Typically, the hooks allow for a command to be pre-verified and "
-"potentially aborted, and allow for a post-notification after the operation "
-"is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and "
-"are enabled by simply removing the `.sample` suffix from the filename. In "
-"earlier versions of Git you had to make them executable."
+#, priority:100
+msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-msgid ""
-"A collection of files with stat information, whose contents are stored as "
-"objects. The index is a stored version of your <<def_working_tree,working "
-"tree>>. Truth be told, it can also contain a second, and even a third "
-"version of a working tree, which are used when <<def_merge,merging>>."
+#, priority:100
+msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-msgid ""
-"The information regarding a particular file, stored in the "
-"<<def_index,index>>. An index entry can be unmerged, if a "
-"<<def_merge,merge>> was started, but not yet finished (i.e. if the index "
-"contains multiple versions of that file)."
+#, priority:100
+msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-msgid ""
-"The default development <<def_branch,branch>>. Whenever you create a Git "
-"<<def_repository,repository>>, a branch named \"master\" is created, and "
-"becomes the active branch. In most cases, this contains the local "
-"development, though that is purely by convention and is not required."
+#, priority:100
+msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-msgid ""
-"As a verb: To bring the contents of another <<def_branch,branch>> (possibly "
-"from an external <<def_repository,repository>>) into the current branch. In "
-"the case where the merged-in branch is from a different repository, this is "
-"done by first <<def_fetch,fetching>> the remote branch and then merging the "
-"result into the current branch. This combination of fetch and merge "
-"operations is called a <<def_pull,pull>>. Merging is performed by an "
-"automatic process that identifies changes made since the branches diverged, "
-"and then applies all those changes together. In cases where changes "
-"conflict, manual intervention may be required to complete the merge."
+#, priority:100
+msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-msgid ""
-"As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful "
-"merge results in the creation of a new <<def_commit,commit>> representing "
-"the result of the merge, and having as <<def_parent,parents>> the tips of "
-"the merged <<def_branch,branches>>. This commit is referred to as a \"merge "
-"commit\", or sometimes just a \"merge\"."
+#, priority:100
+msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-msgid ""
-"The unit of storage in Git. It is uniquely identified by the "
-"<<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be "
-"changed."
+#, priority:100
+msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-msgid ""
-"Stores a set of \"objects\", and an individual <<def_object,object>> is "
-"identified by its <<def_object_name,object name>>. The objects usually live "
-"in `$GIT_DIR/objects/`."
+#, priority:100
+msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
+#, priority:100
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-msgid ""
-"The unique identifier of an <<def_object,object>>. The object name is "
-"usually represented by a 40 character hexadecimal string. Also colloquially "
-"called <<def_SHA1,SHA-1>>."
+#, priority:100
+msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-msgid ""
-"One of the identifiers \"<<def_commit_object,commit>>\", "
-"\"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or "
-"\"<<def_blob_object,blob>>\" describing the type of an "
-"<<def_object,object>>."
+#, priority:100
+msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
+#, priority:100
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-msgid ""
-"The default upstream <<def_repository,repository>>. Most projects have at "
-"least one upstream project which they track. By default 'origin' is used for "
-"that purpose. New upstream updates will be fetched into "
-"<<def_remote_tracking_branch,remote-tracking branches>> named "
-"origin/name-of-upstream-branch, which you can see using `git branch -r`."
+#, priority:100
+msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-msgid ""
-"Only update and add files to the working directory, but don't delete them, "
-"similar to how 'cp -R' would update the contents in the destination "
-"directory. This is the default mode in a <<def_checkout,checkout>> when "
-"checking out files from the <<def_index,index>> or a "
-"<<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes "
-"tracked files not present in the source, similar to 'rsync --delete'."
+#, priority:100
+msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-msgid ""
-"A set of objects which have been compressed into one file (to save space or "
-"to transmit them efficiently)."
+#, priority:100
+msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-msgid ""
-"The list of identifiers, and other information, of the objects in a "
-"<<def_pack,pack>>, to assist in efficiently accessing the contents of a "
-"pack."
+#, priority:100
+msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
+#, priority:100
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-msgid ""
-"Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", "
-"\"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other "
-"commands to limit the scope of operations to some subset of the tree or "
-"worktree. See the documentation of each command for whether paths are "
-"relative to the current directory or toplevel. The pathspec syntax is as "
-"follows:"
+#, priority:100
+msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
+#, priority:100
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-msgid ""
-"the pathspec up to the last slash represents a directory prefix. The scope "
-"of that pathspec is limited to that subtree."
+#, priority:100
+msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-msgid ""
-"the rest of the pathspec is a pattern for the remainder of the pathname. "
-"Paths relative to the directory prefix will be matched against that pattern "
-"using fnmatch(3); in particular, '*' and '?' _can_ match directory "
-"separators."
+#, priority:100
+msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-msgid ""
-"For example, Documentation/*.jpg will match all .jpg files in the "
-"Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
+#, priority:100
+msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-msgid ""
-"A pathspec that begins with a colon `:` has special meaning. In the short "
-"form, the leading colon `:` is followed by zero or more \"magic signature\" "
-"letters (which optionally is terminated by another colon `:`), and the "
-"remainder is the pattern to match against the path. The \"magic signature\" "
-"consists of ASCII symbols that are neither alphanumeric, glob, regex special "
-"characters nor colon. The optional colon that terminates the \"magic "
-"signature\" can be omitted if the pattern begins with a character that does "
-"not belong to \"magic signature\" symbol set and is not a colon."
+#, priority:100
+msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-msgid ""
-"In the long form, the leading colon `:` is followed by an open parenthesis "
-"`(`, a comma-separated list of zero or more \"magic words\", and a close "
-"parentheses `)`, and the remainder is the pattern to match against the path."
+#, priority:100
+msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-msgid ""
-"A pathspec with only a colon means \"there is no pathspec\". This form "
-"should not be combined with other pathspec."
+#, priority:100
+msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap
+#, no-wrap, priority:100
msgid "top"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:359
-msgid ""
-"The magic word `top` (magic signature: `/`) makes the pattern match from the "
-"root of the working tree, even when you are running the command from inside "
-"a subdirectory."
+#, priority:100
+msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap
+#, no-wrap, priority:100
msgid "literal"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:363
-msgid ""
-"Wildcards in the pattern such as `*` or `?` are treated as literal "
-"characters."
+#, priority:100
+msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap
+#, no-wrap, priority:100
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, fuzzy
+#, fuzzy, priority:100
msgid "Case insensitive match."
msgstr "b첬squeda insensible a may첬sculas"
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:100
msgid "glob"
msgstr "blob"
#. type: Plain text
#: en/glossary-content.txt:374
-msgid ""
-"Git treats the pattern as a shell glob suitable for consumption by "
-"fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not "
-"match a / in the pathname. For example, \"Documentation/{asterisk}.html\" "
-"matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or "
-"\"tools/perf/Documentation/perf.html\"."
+#, priority:100
+msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-msgid ""
-"Two consecutive asterisks (\"`**`\") in patterns matched against full "
-"pathname may have special meaning:"
+#, priority:100
+msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-msgid ""
-"A leading \"`**`\" followed by a slash means match in all directories. For "
-"example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same "
-"as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" "
-"anywhere that is directly under directory \"`foo`\"."
+#, priority:100
+msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-msgid ""
-"A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" "
-"matches all files inside directory \"abc\", relative to the location of the "
-"`.gitignore` file, with infinite depth."
+#, priority:100
+msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-msgid ""
-"A slash followed by two consecutive asterisks then a slash matches zero or "
-"more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", "
-"\"`a/x/y/b`\" and so on."
+#, priority:100
+msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
+#, priority:100
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
+#, priority:100
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap
+#, no-wrap, priority:100
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-msgid ""
-"After `attr:` comes a space separated list of \"attribute requirements\", "
-"all of which must be met in order for the path to be considered a match; "
-"this is in addition to the usual non-magic pathspec pattern matching. See "
-"linkgit:gitattributes[5]."
+#, priority:100
+msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
+#, priority:100
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
+#, priority:100
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
+#, priority:100
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-msgid ""
-"\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string "
-"`VALUE`."
+#, priority:100
+msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
+#, priority:100
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-msgid ""
-"Note that when matching against a tree object, attributes are still obtained "
-"from working tree, not from the given tree object."
+#, priority:100
+msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap
+#, no-wrap, priority:100
msgid "exclude"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:425
-msgid ""
-"After a path matches any non-exclude pathspec, it will be run through all "
-"exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, "
-"the path is ignored. When there is no non-exclude pathspec, the exclusion "
-"is applied to the result set as if invoked without any pathspec."
+#, priority:100
+msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-msgid ""
-"A <<def_commit_object,commit object>> contains a (possibly empty) list of "
-"the logical predecessor(s) in the line of development, i.e. its parents."
+#, priority:100
+msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-msgid ""
-"The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore "
-"routines that help select changes that add or delete a given text "
-"string. With the `--pickaxe-all` option, it can be used to view the full "
-"<<def_changeset,changeset>> that introduced or removed, say, a particular "
-"line of text. See linkgit:git-diff[1]."
+#, priority:100
+msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
+#, priority:100
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-msgid ""
-"Cute name for programs and program suites depending on <<def_core_git,core "
-"Git>>, presenting a high level access to core Git. Porcelains expose more of "
-"a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
+#, priority:100
+msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-msgid ""
-"Refs that are per-<<def_working_tree,worktree>>, rather than global. This "
-"is presently only <<def_HEAD,HEAD>> and any refs that start with "
-"`refs/bisect/`, but might later include other unusual refs."
+#, priority:100
+msgid "Refs that are per-<<def_working_tree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-msgid ""
-"Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for "
-"the purposes of rev-parse, but which are treated specially by git. "
-"Pseudorefs both have names that are all-caps, and always start with a line "
-"consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not "
-"a pseudoref, because it is sometimes a symbolic ref. They might optionally "
-"contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are "
-"examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files "
-"cannot be symbolic refs, and never have reflogs. They also cannot be "
-"updated through the normal ref update machinery. Instead, they are updated "
-"by directly writing to the files. However, they can be read as if they were "
-"refs, so `git rev-parse MERGE_HEAD` will work."
+#, priority:100
+msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-msgid ""
-"Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and "
-"<<def_merge,merge>> it. See also linkgit:git-pull[1]."
+#, priority:100
+msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-msgid ""
-"Pushing a <<def_branch,branch>> means to get the branch's "
-"<<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find "
-"out if it is an ancestor to the branch's local head ref, and in that case, "
-"putting all objects, which are <<def_reachable,reachable>> from the local "
-"head ref, and which are missing from the remote repository, into the remote "
-"<<def_object_database,object database>>, and updating the remote head "
-"ref. If the remote <<def_head,head>> is not an ancestor to the local head, "
-"the push fails."
+#, priority:100
+msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-msgid ""
-"All of the ancestors of a given <<def_commit,commit>> are said to be "
-"\"reachable\" from that commit. More generally, one <<def_object,object>> is "
-"reachable from another if we can reach the one from the other by a "
-"<<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, "
-"<<def_commit_object,commits>> to their parents or trees, and "
-"<<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that "
-"they contain."
+#, priority:100
+msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-msgid ""
-"To reapply a series of changes from a <<def_branch,branch>> to a different "
-"base, and reset the <<def_head,head>> of that branch to the result."
+#, priority:100
+msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-msgid ""
-"A name that begins with `refs/` (e.g. `refs/heads/master`) that points to "
-"an <<def_object_name,object name>> or another ref (the latter is called a "
-"<<def_symref,symbolic ref>>). For convenience, a ref can sometimes be "
-"abbreviated when used as an argument to a Git command; see "
-"linkgit:gitrevisions[7] for details. Refs are stored in the "
-"<<def_repository,repository>>."
+#, priority:100
+msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-msgid ""
-"The ref namespace is hierarchical. Different subhierarchies are used for "
-"different purposes (e.g. the `refs/heads/` hierarchy is used to represent "
-"local branches)."
+#, priority:100
+msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-msgid ""
-"There are a few special-purpose refs that do not begin with `refs/`. The "
-"most notable example is `HEAD`."
+#, priority:100
+msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-msgid ""
-"A reflog shows the local \"history\" of a ref. In other words, it can tell "
-"you what the 3rd last revision in _this_ repository was, and what was the "
-"current state in _this_ repository, yesterday 9:14pm. See "
-"linkgit:git-reflog[1] for details."
+#, priority:100
+msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-msgid ""
-"A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to "
-"describe the mapping between remote <<def_ref,ref>> and local ref."
+#, priority:100
+msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-msgid ""
-"A <<def_repository,repository>> which is used to track the same project but "
-"resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> "
-"or <<def_push,push>>."
+#, priority:100
+msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-msgid ""
-"A <<def_ref,ref>> that is used to follow changes from another "
-"<<def_repository,repository>>. It typically looks like "
-"'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a "
-"remote named 'foo'), and matches the right-hand-side of a configured fetch "
-"<<def_refspec,refspec>>. A remote-tracking branch should not contain direct "
-"modifications or have local commits made to it."
+#, priority:100
+msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-msgid ""
-"A collection of <<def_ref,refs>> together with an "
-"<<def_object_database,object database>> containing all objects which are "
-"<<def_reachable,reachable>> from the refs, possibly accompanied by meta data "
-"from one or more <<def_porcelain,porcelains>>. A repository can share an "
-"object database with other repositories via "
-"<<def_alternate_object_database,alternates mechanism>>."
+#, priority:100
+msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-msgid ""
-"The action of fixing up manually what a failed automatic <<def_merge,merge>> "
-"left behind."
+#, priority:100
+msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
+#, priority:100
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-msgid ""
-"To throw away part of the development, i.e. to assign the <<def_head,head>> "
-"to an earlier <<def_revision,revision>>."
+#, priority:100
+msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
+#, priority:100
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-msgid ""
-"\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context "
-"of Git used as a synonym for <<def_object_name,object name>>."
+#, priority:100
+msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-msgid ""
-"Mostly a synonym to <<def_shallow_repository,shallow repository>> but the "
-"phrase makes it more explicit that it was created by running `git clone "
-"--depth=...` command."
+#, ignore-ellipsis, priority:100
+msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-msgid ""
-"A shallow <<def_repository,repository>> has an incomplete history some of "
-"whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in "
-"other words, Git is told to pretend that these commits do not have the "
-"parents, even though they are recorded in the <<def_commit_object,commit "
-"object>>). This is sometimes useful when you are interested only in the "
-"recent history of a project even though the real history recorded in the "
-"upstream is much larger. A shallow repository is created by giving the "
-"`--depth` option to linkgit:git-clone[1], and its history can be later "
-"deepened with linkgit:git-fetch[1]."
+#, priority:100
+msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-msgid ""
-"An <<def_object,object>> used to temporarily store the contents of a "
-"<<def_dirty,dirty>> working directory and the index for future reuse."
+#, priority:100
+msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-msgid ""
-"A <<def_repository,repository>> that holds the history of a separate project "
-"inside another repository (the latter of which is called <<def_superproject, "
-"superproject>>)."
+#, priority:100
+msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-msgid ""
-"A <<def_repository,repository>> that references repositories of other "
-"projects in its working tree as <<def_submodule,submodules>>. The "
-"superproject knows about the names of (but does not hold copies of) commit "
-"objects of the contained submodules."
+#, priority:100
+msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-msgid ""
-"Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, "
-"it is of the format 'ref: refs/some/thing' and when referenced, it "
-"recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime "
-"example of a symref. Symbolic references are manipulated with the "
-"linkgit:git-symbolic-ref[1] command."
+#, priority:100
+msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-msgid ""
-"A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of "
-"an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> "
-"or a <<def_commit_object,commit object>>). In contrast to a "
-"<<def_head,head>>, a tag is not updated by the `commit` command. A Git tag "
-"has nothing to do with a Lisp tag (which would be called an "
-"<<def_object_type,object type>> in Git's context). A tag is most typically "
-"used to mark a particular point in the commit ancestry <<def_chain,chain>>."
+#, priority:100
+msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-msgid ""
-"An <<def_object,object>> containing a <<def_ref,ref>> pointing to another "
-"object, which can contain a message just like a <<def_commit_object,commit "
-"object>>. It can also contain a (PGP) signature, in which case it is called "
-"a \"signed tag object\"."
+#, priority:100
+msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-msgid ""
-"A regular Git <<def_branch,branch>> that is used by a developer to identify "
-"a conceptual line of development. Since branches are very easy and "
-"inexpensive, it is often desirable to have several small branches that each "
-"contain very well defined concepts or small incremental yet related changes."
+#, priority:100
+msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-msgid ""
-"Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree "
-"object>> together with the dependent <<def_blob_object,blob>> and tree "
-"objects (i.e. a stored representation of a working tree)."
+#, priority:100
+msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-msgid ""
-"An <<def_object,object>> containing a list of file names and modes along "
-"with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is "
-"equivalent to a <<def_directory,directory>>."
+#, priority:100
+msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-msgid ""
-"A <<def_tree_object,tree object>> or an <<def_object,object>> that can be "
-"recursively dereferenced to a tree object. Dereferencing a "
-"<<def_commit_object,commit object>> yields the tree object corresponding to "
-"the <<def_revision,revision>>'s top <<def_directory,directory>>. The "
-"following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree "
-"object, a <<def_tag_object,tag object>> that points to a tree object, a tag "
-"object that points to a tag object that points to a tree object, etc."
+#, priority:100
+msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-msgid ""
-"An <<def_index,index>> which contains unmerged <<def_index_entry,index "
-"entries>>."
+#, priority:100
+msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-msgid ""
-"An <<def_object,object>> which is not <<def_reachable,reachable>> from a "
-"<<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
+#, priority:100
+msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-msgid ""
-"The default <<def_branch,branch>> that is merged into the branch in question "
-"(or the branch in question is rebased onto). It is configured via "
-"branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' "
-"is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
+#, priority:100
+msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap
+#, no-wrap, priority:100
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:671
-msgid ""
-"The tree of actual checked out files. The working tree normally contains "
-"the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes "
-"that you have made but not yet committed."
+#, priority:100
+msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Plain text
#: en/i18n.txt:2
+#, priority:280
msgid "Git is to some extent character encoding agnostic."
msgstr ""
#. type: Plain text
#: en/i18n.txt:6
-msgid ""
-"The contents of the blob objects are uninterpreted sequences of bytes. "
-"There is no encoding translation at the core level."
+#, priority:280
+msgid "The contents of the blob objects are uninterpreted sequences of bytes. There is no encoding translation at the core level."
msgstr ""
#. type: Plain text
#: en/i18n.txt:13
-msgid ""
-"Path names are encoded in UTF-8 normalization form C. This applies to tree "
-"objects, the index file, ref names, as well as path names in command line "
-"arguments, environment variables and config files (`.git/config` (see "
-"linkgit:git-config[1]), linkgit:gitignore[5], linkgit:gitattributes[5] and "
-"linkgit:gitmodules[5])."
+#, priority:280
+msgid "Path names are encoded in UTF-8 normalization form C. This applies to tree objects, the index file, ref names, as well as path names in command line arguments, environment variables and config files (`.git/config` (see linkgit:git-config[1]), linkgit:gitignore[5], linkgit:gitattributes[5] and linkgit:gitmodules[5])."
msgstr ""
#. type: Plain text
#: en/i18n.txt:23
-msgid ""
-"Note that Git at the core level treats path names simply as sequences of "
-"non-NUL bytes, there are no path name encoding conversions (except on Mac "
-"and Windows). Therefore, using non-ASCII path names will mostly work even on "
-"platforms and file systems that use legacy extended ASCII "
-"encodings. However, repositories created on such systems will not work "
-"properly on UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. "
-"Additionally, many Git-based tools simply assume path names to be UTF-8 and "
-"will fail to display other encodings correctly."
+#, priority:280
+msgid "Note that Git at the core level treats path names simply as sequences of non-NUL bytes, there are no path name encoding conversions (except on Mac and Windows). Therefore, using non-ASCII path names will mostly work even on platforms and file systems that use legacy extended ASCII encodings. However, repositories created on such systems will not work properly on UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. Additionally, many Git-based tools simply assume path names to be UTF-8 and will fail to display other encodings correctly."
msgstr ""
#. type: Plain text
#: en/i18n.txt:29
-msgid ""
-"Commit log messages are typically encoded in UTF-8, but other extended ASCII "
-"encodings are also supported. This includes ISO-8859-x, CP125x and many "
-"others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, "
-"Shift-JIS, Big5, EUC-x, CP9xx etc.)."
+#, priority:280
+msgid "Commit log messages are typically encoded in UTF-8, but other extended ASCII encodings are also supported. This includes ISO-8859-x, CP125x and many others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5, EUC-x, CP9xx etc.)."
msgstr ""
#. type: Plain text
#: en/i18n.txt:36
-msgid ""
-"Although we encourage that the commit log messages are encoded in UTF-8, "
-"both the core and Git Porcelain are designed not to force UTF-8 on "
-"projects. If all participants of a particular project find it more "
-"convenient to use legacy encodings, Git does not forbid it. However, there "
-"are a few things to keep in mind."
+#, priority:280
+msgid "Although we encourage that the commit log messages are encoded in UTF-8, both the core and Git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular project find it more convenient to use legacy encodings, Git does not forbid it. However, there are a few things to keep in mind."
msgstr ""
#. type: Plain text
#: en/i18n.txt:42
-msgid ""
-"'git commit' and 'git commit-tree' issues a warning if the commit log "
-"message given to it does not look like a valid UTF-8 string, unless you "
-"explicitly say your project uses a legacy encoding. The way to say this is "
-"to have i18n.commitencoding in `.git/config` file, like this:"
+#, priority:280
+msgid "'git commit' and 'git commit-tree' issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in `.git/config` file, like this:"
msgstr ""
#. type: delimited block -
#: en/i18n.txt:46
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"[i18n]\n"
"\tcommitEncoding = ISO-8859-1\n"
@@ -67086,25 +57363,19 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:52
-msgid ""
-"Commit objects created with the above setting record the value of "
-"`i18n.commitEncoding` in its `encoding` header. This is to help other "
-"people who look at them later. Lack of this header implies that the commit "
-"log message is encoded in UTF-8."
+#, priority:280
+msgid "Commit objects created with the above setting record the value of `i18n.commitEncoding` in its `encoding` header. This is to help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF-8."
msgstr ""
#. type: Plain text
#: en/i18n.txt:58
-msgid ""
-"'git log', 'git show', 'git blame' and friends look at the `encoding` header "
-"of a commit object, and try to re-code the log message into UTF-8 unless "
-"otherwise specified. You can specify the desired output encoding with "
-"`i18n.logOutputEncoding` in `.git/config` file, like this:"
+#, priority:280
+msgid "'git log', 'git show', 'git blame' and friends look at the `encoding` header of a commit object, and try to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with `i18n.logOutputEncoding` in `.git/config` file, like this:"
msgstr ""
#. type: delimited block -
#: en/i18n.txt:62
-#, no-wrap
+#, no-wrap, priority:280
msgid ""
"[i18n]\n"
"\tlogOutputEncoding = ISO-8859-1\n"
@@ -67112,148 +57383,133 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:66
-msgid ""
-"If you do not have this configuration variable, the value of "
-"`i18n.commitEncoding` is used instead."
+#, priority:280
+msgid "If you do not have this configuration variable, the value of `i18n.commitEncoding` is used instead."
msgstr ""
#. type: Plain text
#: en/i18n.txt:70
-msgid ""
-"Note that we deliberately chose not to re-code the commit log message when a "
-"commit is made to force UTF-8 at the commit object level, because re-coding "
-"to UTF-8 is not necessarily a reversible operation."
+#, priority:280
+msgid "Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a reversible operation."
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:2
+#, priority:260
msgid "<start> and <end> can take one of these forms:"
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:4
+#, priority:260
msgid "number"
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:7
-msgid ""
-"If <start> or <end> is a number, it specifies an absolute line number (lines "
-"count from 1)."
+#, priority:260
+msgid "If <start> or <end> is a number, it specifies an absolute line number (lines count from 1)."
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:10
+#, priority:260
msgid "/regex/"
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:17
-msgid ""
-"This form will use the first line matching the given POSIX regex. If <start> "
-"is a regex, it will search from the end of the previous `-L` range, if any, "
-"otherwise from the start of file. If <start> is ``^/regex/'', it will "
-"search from the start of file. If <end> is a regex, it will search starting "
-"at the line given by <start>."
+#, priority:260
+msgid "This form will use the first line matching the given POSIX regex. If <start> is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file. If <start> is ``^/regex/'', it will search from the start of file. If <end> is a regex, it will search starting at the line given by <start>."
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:20
+#, priority:260
msgid "+offset or -offset"
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:23
-msgid ""
-"This is only valid for <end> and will specify a number of lines before or "
-"after the line given by <start>."
+#, priority:260
+msgid "This is only valid for <end> and will specify a number of lines before or after the line given by <start>."
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:30
-msgid ""
-"If ``:<funcname>'' is given in place of <start> and <end>, it is a regular "
-"expression that denotes the range from the first funcname line that matches "
-"<funcname>, up to the next funcname line. ``:<funcname>'' searches from the "
-"end of the previous `-L` range, if any, otherwise from the start of "
-"file. ``^:<funcname>'' searches from the start of file."
+#, priority:260
+msgid "If ``:<funcname>'' is given in place of <start> and <end>, it is a regular expression that denotes the range from the first funcname line that matches <funcname>, up to the next funcname line. ``:<funcname>'' searches from the end of the previous `-L` range, if any, otherwise from the start of file. ``^:<funcname>'' searches from the start of file."
msgstr ""
#. type: Plain text
#: en/mailmap.txt:6
-msgid ""
-"If the file `.mailmap` exists at the toplevel of the repository, or at the "
-"location pointed to by the mailmap.file or mailmap.blob configuration "
-"options, it is used to map author and committer names and email addresses to "
-"canonical real names and email addresses."
+#, priority:260
+msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses."
msgstr ""
#. type: Plain text
#: en/mailmap.txt:10
-msgid ""
-"In the simple form, each line in the file consists of the canonical real "
-"name of an author, whitespace, and an email address used in the commit "
-"(enclosed by '<' and '>') to map to the name. For example:"
+#, priority:260
+msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:"
msgstr ""
#. type: Plain text
#: en/mailmap.txt:12
-#, no-wrap
+#, no-wrap, priority:260
msgid "\tProper Name <commit@email.xx>\n"
msgstr ""
#. type: Plain text
#: en/mailmap.txt:15
+#, priority:260
msgid "The more complex forms are:"
msgstr ""
#. type: Plain text
#: en/mailmap.txt:17
-#, no-wrap
+#, no-wrap, priority:260
msgid "\t<proper@email.xx> <commit@email.xx>\n"
msgstr ""
#. type: Plain text
#: en/mailmap.txt:19
+#, priority:260
msgid "which allows mailmap to replace only the email part of a commit, and:"
msgstr ""
#. type: Plain text
#: en/mailmap.txt:21
-#, no-wrap
+#, no-wrap, priority:260
msgid "\tProper Name <proper@email.xx> <commit@email.xx>\n"
msgstr ""
#. type: Plain text
#: en/mailmap.txt:24
-msgid ""
-"which allows mailmap to replace both the name and the email of a commit "
-"matching the specified commit email address, and:"
+#, priority:260
+msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:"
msgstr ""
#. type: Plain text
#: en/mailmap.txt:26
-#, no-wrap
+#, no-wrap, priority:260
msgid "\tProper Name <proper@email.xx> Commit Name <commit@email.xx>\n"
msgstr ""
#. type: Plain text
#: en/mailmap.txt:29
-msgid ""
-"which allows mailmap to replace both the name and the email of a commit "
-"matching both the specified commit name and email address."
+#, priority:260
+msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address."
msgstr ""
#. type: Plain text
#: en/mailmap.txt:32
-msgid ""
-"Example 1: Your history contains commits by two authors, Jane and Joe, whose "
-"names appear in the repository under several forms:"
+#, priority:260
+msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:"
msgstr ""
#. type: delimited block -
#: en/mailmap.txt:39
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"Joe Developer <joe@example.com>\n"
"Joe R. Developer <joe@example.com>\n"
@@ -67264,14 +57520,13 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:44
-msgid ""
-"Now suppose that Joe wants his middle name initial used, and Jane prefers "
-"her family name fully spelled out. A proper `.mailmap` file would look like:"
+#, priority:260
+msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:"
msgstr ""
#. type: delimited block -
#: en/mailmap.txt:48
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"Jane Doe <jane@desktop.(none)>\n"
"Joe R. Developer <joe@example.com>\n"
@@ -67279,19 +57534,19 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:52
-msgid ""
-"Note how there is no need for an entry for `<jane@laptop.(none)>`, because "
-"the real name of that author is already correct."
+#, priority:260
+msgid "Note how there is no need for an entry for `<jane@laptop.(none)>`, because the real name of that author is already correct."
msgstr ""
#. type: Plain text
#: en/mailmap.txt:55
+#, priority:260
msgid "Example 2: Your repository contains commits from the following authors:"
msgstr ""
#. type: delimited block -
#: en/mailmap.txt:63
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"nick1 <bugs@company.xx>\n"
"nick2 <bugs@company.xx>\n"
@@ -67303,12 +57558,13 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:66
+#, priority:260
msgid "Then you might want a `.mailmap` file that looks like:"
msgstr ""
#. type: delimited block -
#: en/mailmap.txt:72
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"<cto@company.xx> <cto@coompany.xx>\n"
"Some Dude <some@dude.xx> nick1 <bugs@company.xx>\n"
@@ -67319,588 +57575,464 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:75
-msgid ""
-"Use hash '#' for comments that are either on their own line, or after the "
-"email address."
+#, priority:260
+msgid "Use hash '#' for comments that are either on their own line, or after the email address."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:5
-msgid ""
-"Perform the merge and commit the result. This option can be used to override "
-"--no-commit."
+#, priority:240
+msgid "Perform the merge and commit the result. This option can be used to override --no-commit."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:9
-msgid ""
-"With --no-commit perform the merge and stop just before creating a merge "
-"commit, to give the user a chance to inspect and further tweak the merge "
-"result before committing."
+#, priority:240
+msgid "With --no-commit perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:14
-msgid ""
-"Note that fast-forward updates do not create a merge commit and therefore "
-"there is no way to stop those merges with --no-commit. Thus, if you want to "
-"ensure your branch is not changed or updated by the merge command, use "
-"--no-ff with --no-commit."
+#, priority:240
+msgid "Note that fast-forward updates do not create a merge commit and therefore there is no way to stop those merges with --no-commit. Thus, if you want to ensure your branch is not changed or updated by the merge command, use --no-ff with --no-commit."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:23
-msgid ""
-"Invoke an editor before committing successful mechanical merge to further "
-"edit the auto-generated merge message, so that the user can explain and "
-"justify the merge. The `--no-edit` option can be used to accept the "
-"auto-generated message (this is generally discouraged)."
+#, priority:240
+msgid "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally discouraged)."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:27
-msgid ""
-"The `--edit` (or `-e`) option is still useful if you are giving a draft "
-"message with the `-m` option from the command line and want to edit it in "
-"the editor."
+#, priority:240
+msgid "The `--edit` (or `-e`) option is still useful if you are giving a draft message with the `-m` option from the command line and want to edit it in the editor."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:34
-msgid ""
-"Older scripts may depend on the historical behaviour of not allowing the "
-"user to edit the merge log message. They will see an editor opened when they "
-"run `git merge`. To make it easier to adjust such scripts to the updated "
-"behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` "
-"at the beginning of them."
+#, priority:240
+msgid "Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run `git merge`. To make it easier to adjust such scripts to the updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:41
-msgid ""
-"This option determines how the merge message will be cleaned up before "
-"committing. See linkgit:git-commit[1] for more details. In addition, if the "
-"'<mode>' is given a value of `scissors`, scissors will be appended to "
-"`MERGE_MSG` before being passed on to the commit machinery in the case of a "
-"merge conflict."
+#, priority:240
+msgid "This option determines how the merge message will be cleaned up before committing. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:44
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--ff-only"
msgstr "--ff-only"
#. type: Plain text
#: en/merge-options.txt:50
-msgid ""
-"Specifies how a merge is handled when the merged-in history is already a "
-"descendant of the current history. `--ff` is the default unless merging an "
-"annotated (and possibly signed) tag that is not stored in its natural place "
-"in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
+#, priority:240
+msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:55
-msgid ""
-"With `--ff`, when possible resolve the merge as a fast-forward (only update "
-"the branch pointer to match the merged branch; do not create a merge "
-"commit). When not possible (when the merged-in history is not a descendant "
-"of the current history), create a merge commit."
+#, priority:240
+msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:58
-msgid ""
-"With `--no-ff`, create a merge commit in all cases, even when the merge "
-"could instead be resolved as a fast-forward."
+#, priority:240
+msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:61
-msgid ""
-"With `--ff-only`, resolve the merge as a fast-forward when possible. When "
-"not possible, refuse to merge and exit with a non-zero status."
+#, priority:240
+msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:67
-msgid ""
-"GPG-sign the resulting merge commit. The `keyid` argument is optional and "
-"defaults to the committer identity; if specified, it must be stuck to the "
-"option without a space."
+#, priority:240
+msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:73
-msgid ""
-"In addition to branch names, populate the log message with one-line "
-"descriptions from at most <n> actual commits that are being merged. See also "
-"linkgit:git-fmt-merge-msg[1]."
+#, priority:240
+msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:76
-msgid ""
-"With --no-log do not list one-line descriptions from the actual commits "
-"being merged."
+#, priority:240
+msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:78
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/merge-options.txt:87
+#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:93
-msgid ""
-"Show a diffstat at the end of the merge. The diffstat is also controlled by "
-"the configuration option merge.stat."
+#, priority:240
+msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:96
+#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:97
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:98
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
#: en/merge-options.txt:106
-msgid ""
-"Produce the working tree and index state as if a real merge happened (except "
-"for the merge information), but do not actually make a commit, move the "
-"`HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` "
-"command to create a merge commit). This allows you to create a single "
-"commit on top of the current branch whose effect is the same as merging "
-"another branch (or more in case of an octopus)."
+#, priority:240
+msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:109
-msgid ""
-"With --no-squash perform the merge and commit the result. This option can be "
-"used to override --squash."
+#, priority:240
+msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:111
+#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:115
-msgid ""
-"This option bypasses the pre-merge and commit-msg hooks. See also "
-"linkgit:githooks[5]."
+#, priority:240
+msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:123
-msgid ""
-"Use the given merge strategy; can be supplied more than once to specify them "
-"in the order they should be tried. If there is no `-s` option, a built-in "
-"list of strategies is used instead ('git merge-recursive' when merging a "
-"single head, 'git merge-octopus' otherwise)."
+#, priority:240
+msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:124
-#, no-wrap
+#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
#: en/merge-options.txt:128
+#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:129
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:130
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
#: en/merge-options.txt:136
-msgid ""
-"Verify that the tip commit of the side branch being merged is signed with a "
-"valid key, i.e. a key that has a valid uid: in the default trust model, this "
-"means the signing key has been signed by a trusted key. If the tip commit "
-"of the side branch is not signed with a valid key, the merge is aborted."
+#, priority:240
+msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:138
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
#: en/merge-options.txt:141
-msgid ""
-"Synonyms to --stat and --no-stat; these are deprecated and will be removed "
-"in the future."
+#, priority:240
+msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:146
+#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:157
-msgid ""
-"Turn progress on/off explicitly. If neither is specified, progress is shown "
-"if standard error is connected to a terminal. Note that not all merge "
-"strategies may support progress reporting."
+#, priority:240
+msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:160
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
#: en/merge-options.txt:166
-msgid ""
-"By default, `git merge` command refuses to merge histories that do not share "
-"a common ancestor. This option can be used to override this safety when "
-"merging histories of two projects that started their lives independently. As "
-"that is a very rare occasion, no configuration variable to enable this by "
-"default exists and will not be added."
+#, priority:240
+msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
#. type: Title -
#: en/merge-strategies.txt:2
-#, no-wrap
+#, no-wrap, priority:240
msgid "MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:8
-msgid ""
-"The merge mechanism (`git merge` and `git pull` commands) allows the backend "
-"'merge strategies' to be chosen with `-s` option. Some strategies can also "
-"take their own options, which can be passed by giving `-X<option>` arguments "
-"to `git merge` and/or `git pull`."
+#, priority:240
+msgid "The merge mechanism (`git merge` and `git pull` commands) allows the backend 'merge strategies' to be chosen with `-s` option. Some strategies can also take their own options, which can be passed by giving `-X<option>` arguments to `git merge` and/or `git pull`."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "resolve"
msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
-msgid ""
-"This can only resolve two heads (i.e. the current branch and another branch "
-"you pulled from) using a 3-way merge algorithm. It tries to carefully "
-"detect criss-cross merge ambiguities and is considered generally safe and "
-"fast."
+#, priority:240
+msgid "This can only resolve two heads (i.e. the current branch and another branch you pulled from) using a 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and fast."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "recursive"
msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
-msgid ""
-"This can only resolve two heads using a 3-way merge algorithm. When there "
-"is more than one common ancestor that can be used for 3-way merge, it "
-"creates a merged tree of the common ancestors and uses that as the reference "
-"tree for the 3-way merge. This has been reported to result in fewer merge "
-"conflicts without causing mismerges by tests done on actual merge commits "
-"taken from Linux 2.6 kernel development history. Additionally this can "
-"detect and handle merges involving renames, but currently cannot make use of "
-"detected copies. This is the default merge strategy when pulling or merging "
-"one branch."
+#, priority:240
+msgid "This can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving renames, but currently cannot make use of detected copies. This is the default merge strategy when pulling or merging one branch."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:31
+#, priority:240
msgid "The 'recursive' strategy can take the following options:"
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "ours"
msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
-msgid ""
-"This option forces conflicting hunks to be auto-resolved cleanly by favoring "
-"'our' version. Changes from the other tree that do not conflict with our "
-"side are reflected in the merge result. For a binary file, the entire "
-"contents are taken from our side."
+#, priority:240
+msgid "This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' version. Changes from the other tree that do not conflict with our side are reflected in the merge result. For a binary file, the entire contents are taken from our side."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:41
-msgid ""
-"This should not be confused with the 'ours' merge strategy, which does not "
-"even look at what the other tree contains at all. It discards everything "
-"the other tree did, declaring 'our' history contains all that happened in "
-"it."
+#, priority:240
+msgid "This should not be confused with the 'ours' merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring 'our' history contains all that happened in it."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "theirs"
msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
-msgid ""
-"This is the opposite of 'ours'; note that, unlike 'ours', there is no "
-"'theirs' merge strategy to confuse this merge option with."
+#, priority:240
+msgid "This is the opposite of 'ours'; note that, unlike 'ours', there is no 'theirs' merge strategy to confuse this merge option with."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "patience"
msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
-msgid ""
-"With this option, 'merge-recursive' spends a little extra time to avoid "
-"mismerges that sometimes occur due to unimportant matching lines (e.g., "
-"braces from distinct functions). Use this when the branches to be merged "
-"have diverged wildly. See also linkgit:git-diff[1] `--patience`."
+#, priority:240
+msgid "With this option, 'merge-recursive' spends a little extra time to avoid mismerges that sometimes occur due to unimportant matching lines (e.g., braces from distinct functions). Use this when the branches to be merged have diverged wildly. See also linkgit:git-diff[1] `--patience`."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
-msgid ""
-"Tells 'merge-recursive' to use a different diff algorithm, which can help "
-"avoid mismerges that occur due to unimportant matching lines (such as braces "
-"from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
+#, priority:240
+msgid "Tells 'merge-recursive' to use a different diff algorithm, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
msgstr "ignore-cr-at-eol"
#. type: Plain text
#: en/merge-strategies.txt:68
-msgid ""
-"Treats lines with the indicated type of whitespace change as unchanged for "
-"the sake of a three-way merge. Whitespace changes mixed with other changes "
-"to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, "
-"`--ignore-space-at-eol`, and `--ignore-cr-at-eol`."
+#, priority:240
+msgid "Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, `--ignore-space-at-eol`, and `--ignore-cr-at-eol`."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:71
-msgid ""
-"If 'their' version only introduces whitespace changes to a line, 'our' "
-"version is used;"
+#, priority:240
+msgid "If 'their' version only introduces whitespace changes to a line, 'our' version is used;"
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:73
-msgid ""
-"If 'our' version introduces whitespace changes but 'their' version includes "
-"a substantial change, 'their' version is used;"
+#, priority:240
+msgid "If 'our' version introduces whitespace changes but 'their' version includes a substantial change, 'their' version is used;"
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:74
+#, priority:240
msgid "Otherwise, the merge proceeds in the usual way."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "renormalize"
msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
-msgid ""
-"This runs a virtual check-out and check-in of all three stages of a file "
-"when resolving a three-way merge. This option is meant to be used when "
-"merging branches with different clean filters or end-of-line normalization "
-"rules. See \"Merging branches with differing checkin/checkout attributes\" "
-"in linkgit:gitattributes[5] for details."
+#, priority:240
+msgid "This runs a virtual check-out and check-in of all three stages of a file when resolving a three-way merge. This option is meant to be used when merging branches with different clean filters or end-of-line normalization rules. See \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
-msgid ""
-"Disables the `renormalize` option. This overrides the `merge.renormalize` "
-"configuration variable."
+#, priority:240
+msgid "Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "no-renames"
msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
-msgid ""
-"Turn off rename detection. This overrides the `merge.renames` configuration "
-"variable. See also linkgit:git-diff[1] `--no-renames`."
+#, priority:240
+msgid "Turn off rename detection. This overrides the `merge.renames` configuration variable. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:92
-#, no-wrap
+#, no-wrap, priority:240
msgid "find-renames[=<n>]"
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:97
-msgid ""
-"Turn on rename detection, optionally setting the similarity threshold. This "
-"is the default. This overrides the 'merge.renames' configuration variable. "
-"See also linkgit:git-diff[1] `--find-renames`."
+#, priority:240
+msgid "Turn on rename detection, optionally setting the similarity threshold. This is the default. This overrides the 'merge.renames' configuration variable. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:98
-#, no-wrap
+#, no-wrap, priority:240
msgid "rename-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:100
+#, priority:240
msgid "Deprecated synonym for `find-renames=<n>`."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:101
-#, no-wrap
+#, no-wrap, priority:240
msgid "subtree[=<path>]"
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:107
-msgid ""
-"This option is a more advanced form of 'subtree' strategy, where the "
-"strategy makes a guess on how two trees must be shifted to match with each "
-"other when merging. Instead, the specified path is prefixed (or stripped "
-"from the beginning) to make the shape of two trees to match."
+#, priority:240
+msgid "This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging. Instead, the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "octopus"
msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
-msgid ""
-"This resolves cases with more than two heads, but refuses to do a complex "
-"merge that needs manual resolution. It is primarily meant to be used for "
-"bundling topic branch heads together. This is the default merge strategy "
-"when pulling or merging more than one branch."
+#, priority:240
+msgid "This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when pulling or merging more than one branch."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:122
-msgid ""
-"This resolves any number of heads, but the resulting tree of the merge is "
-"always that of the current branch head, effectively ignoring all changes "
-"from all other branches. It is meant to be used to supersede old "
-"development history of side branches. Note that this is different from the "
-"-Xours option to the 'recursive' merge strategy."
+#, priority:240
+msgid "This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches. Note that this is different from the -Xours option to the 'recursive' merge strategy."
msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap
#, ignore-same, no-wrap, priority:240
msgid "subtree"
msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
-msgid ""
-"This is a modified recursive strategy. When merging trees A and B, if B "
-"corresponds to a subtree of A, B is first adjusted to match the tree "
-"structure of A, instead of reading the trees at the same level. This "
-"adjustment is also done to the common ancestor tree."
+#, priority:240
+msgid "This is a modified recursive strategy. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:136
-msgid ""
-"With the strategies that use 3-way merge (including the default, "
-"'recursive'), if a change is made on both branches, but later reverted on "
-"one of the branches, that change will be present in the merged result; some "
-"people find this behavior confusing. It occurs because only the heads and "
-"the merge base are considered when performing a merge, not the individual "
-"commits. The merge algorithm therefore considers the reverted change as no "
-"change at all, and substitutes the changed version instead."
+#, priority:240
+msgid "With the strategies that use 3-way merge (including the default, 'recursive'), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead."
msgstr ""
#. type: Plain text
@@ -68061,29 +58193,20 @@ msgstr "xxdiff"
#. type: Title -
#: en/pretty-formats.txt:2
-#, no-wrap
+#, no-wrap, priority:260
msgid "PRETTY FORMATS"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:13
-msgid ""
-"If the commit is a merge, and if the pretty-format is not 'oneline', 'email' "
-"or 'raw', an additional line is inserted before the 'Author:' line. This "
-"line begins with \"Merge: \" and the hashes of ancestral commits are "
-"printed, separated by spaces. Note that the listed commits may not "
-"necessarily be the list of the *direct* parent commits if you have limited "
-"your view of history: for example, if you are only interested in changes "
-"related to a certain directory or file."
+#, priority:260
+msgid "If the commit is a merge, and if the pretty-format is not 'oneline', 'email' or 'raw', an additional line is inserted before the 'Author:' line. This line begins with \"Merge: \" and the hashes of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the *direct* parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:20
-msgid ""
-"There are several built-in formats, and you can define additional formats by "
-"setting a pretty.<name> config option to either another format name, or a "
-"'format:' string, as described below (see linkgit:git-config[1]). Here are "
-"the details of the built-in formats:"
+#, priority:260
+msgid "There are several built-in formats, and you can define additional formats by setting a pretty.<name> config option to either another format name, or a 'format:' string, as described below (see linkgit:git-config[1]). Here are the details of the built-in formats:"
msgstr ""
#. type: Plain text
@@ -68094,12 +58217,13 @@ msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
-#, no-wrap
+#, no-wrap, priority:260
msgid "<hash> <title line>\n"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:26
+#, priority:260
msgid "This is designed to be as compact as possible."
msgstr ""
@@ -68111,7 +58235,7 @@ msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"commit <hash>\n"
"Author: <author>\n"
@@ -68119,7 +58243,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51 en/pretty-formats.txt:63
-#, no-wrap
+#, no-wrap, priority:260
msgid "<title line>\n"
msgstr ""
@@ -68131,7 +58255,7 @@ msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"commit <hash>\n"
"Author: <author>\n"
@@ -68140,6 +58264,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65 en/pretty-formats.txt:85
+#, priority:260
msgid "<full commit message>"
msgstr ""
@@ -68151,7 +58276,7 @@ msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"commit <hash>\n"
"Author: <author>\n"
@@ -68166,7 +58291,7 @@ msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"commit <hash>\n"
"Author: <author>\n"
@@ -68177,24 +58302,20 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
+#, priority:260
msgid "'reference'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:69
-#, no-wrap
+#, no-wrap, priority:260
msgid "<abbrev hash> (<title line>, <short author date>)\n"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-msgid ""
-"This format is used to refer to another commit in a commit message and is "
-"the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default, the date "
-"is formatted with `--date=short` unless another `--date` option is "
-"explicitly specified. As with any `format:` with format placeholders, its "
-"output is not affected by other options like `--decorate` and "
-"`--walk-reflogs`."
+#, priority:260
+msgid "This format is used to refer to another commit in a commit message and is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default, the date is formatted with `--date=short` unless another `--date` option is explicitly specified. As with any `format:` with format placeholders, its output is not affected by other options like `--decorate` and `--walk-reflogs`."
msgstr ""
#. type: Plain text
@@ -68205,7 +58326,7 @@ msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:83
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"From <hash> <date>\n"
"From: <author>\n"
@@ -68221,182 +58342,171 @@ msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:97
-msgid ""
-"The 'raw' format shows the entire commit exactly as stored in the commit "
-"object. Notably, the hashes are displayed in full, regardless of whether "
-"--abbrev or --no-abbrev are used, and 'parents' information show the true "
-"parent commits, without taking grafts or history simplification into "
-"account. Note that this format affects the way commits are displayed, but "
-"not the way the diff is shown e.g. with `git log --raw`. To get full object "
-"names in a raw diff format, use `--no-abbrev`."
+#, priority:260
+msgid "The 'raw' format shows the entire commit exactly as stored in the commit object. Notably, the hashes are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and 'parents' information show the true parent commits, without taking grafts or history simplification into account. Note that this format affects the way commits are displayed, but not the way the diff is shown e.g. with `git log --raw`. To get full object names in a raw diff format, use `--no-abbrev`."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:99
+#, priority:260
msgid "'format:<string>'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:104
-msgid ""
-"The 'format:<string>' format allows you to specify which information you "
-"want to show. It works a little bit like printf format, with the notable "
-"exception that you get a newline with '%n' instead of '\\n'."
+#, priority:260
+msgid "The 'format:<string>' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\\n'."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:107
-msgid ""
-"E.g, 'format:\"The author of %h was %an, %ar%nThe title was >>%s<<%n\"' "
-"would show something like this:"
+#, priority:260
+msgid "E.g, 'format:\"The author of %h was %an, %ar%nThe title was >>%s<<%n\"' would show something like this:"
msgstr ""
#. type: delimited block -
#: en/pretty-formats.txt:111
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"The author of fe6e0ee was Junio C Hamano, 23 hours ago\n"
-"The title was >>t4119: test autocomputing -p<n> for traditional diff "
-"input.<<\n"
+"The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<\n"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:115
+#, priority:260
msgid "The placeholders are:"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:117
+#, priority:260
msgid "Placeholders that expand to a single literal character:"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:117
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%n'"
msgstr "'%n'"
#. type: Plain text
#: en/pretty-formats.txt:118
+#, priority:260
msgid "newline"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:119
+#, priority:260
msgid "a raw '%'"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:119
-#, no-wrap
+#, no-wrap, priority:260
msgid "'%x00'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:120
+#, priority:260
msgid "print a byte from a hex code"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:122
+#, priority:260
msgid "Placeholders that affect formatting of later placeholders:"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:122
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%Cred'"
msgstr "'%Cred'"
#. type: Plain text
#: en/pretty-formats.txt:123
+#, priority:260
msgid "switch color to red"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:123
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%Cgreen'"
msgstr "'%Cgreen'"
#. type: Plain text
#: en/pretty-formats.txt:124
+#, priority:260
msgid "switch color to green"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:124
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%Cblue'"
msgstr "'%Cblue'"
#. type: Plain text
#: en/pretty-formats.txt:125
+#, priority:260
msgid "switch color to blue"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:125
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%Creset'"
msgstr "'%Creset'"
#. type: Plain text
#: en/pretty-formats.txt:126
+#, priority:260
msgid "reset color"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:126
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:260
msgid "'%C(...)'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:127
+#, priority:260
msgid "color specification, as described under Values in the"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:140
-msgid ""
-"\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors "
-"are shown only when enabled for log output (by `color.diff`, `color.ui`, or "
-"`--color`, and respecting the `auto` settings of the former if we are going "
-"to a terminal). `%C(auto,...)` is accepted as a historical synonym for the "
-"default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the "
-"colors even when color is not otherwise enabled (though consider just using "
-"`--color=always` to enable color for the whole output, including this format "
-"and anything else git might color). `auto` alone (i.e. `%C(auto)`) will "
-"turn on auto coloring on the next placeholders until the color is switched "
-"again."
+#, ignore-ellipsis, priority:260
+msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:140
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%m'"
msgstr "'%m'"
#. type: Plain text
#: en/pretty-formats.txt:141
+#, priority:260
msgid "left (`<`), right (`>`) or boundary (`-`) mark"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:141
-#, no-wrap
+#, no-wrap, priority:260
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:142
+#, priority:260
msgid "switch line wrapping, like the -w option of"
msgstr ""
@@ -68408,892 +58518,871 @@ msgstr "linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/pretty-formats.txt:143
-#, no-wrap
+#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:144
+#, priority:260
msgid "make the next placeholder take at"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:151
-msgid ""
-"least N columns, padding spaces on the right if necessary. Optionally "
-"truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) "
-"if the output is longer than N columns. Note that truncating only works "
-"correctly with N >= 2."
+#, priority:260
+msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:151
-#, no-wrap
+#, no-wrap, priority:260
msgid "'%<|(<N>)'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:152
+#, priority:260
msgid "make the next placeholder take at least until Nth"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:153
+#, priority:260
msgid "columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:153
-#, no-wrap
+#, no-wrap, priority:260
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:154
+#, priority:260
msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:155
+#, priority:260
msgid "but padding spaces on the left"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:155
-#, no-wrap
+#, no-wrap, priority:260
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:156
+#, priority:260
msgid "similar to '%>(<N>)', '%>|(<N>)'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:160
-msgid ""
-"respectively, except that if the next placeholder takes more spaces than "
-"given and there are spaces on its left, use those spaces"
+#, priority:260
+msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:160
-#, no-wrap
+#, no-wrap, priority:260
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:161
+#, priority:260
msgid "similar to '%<(<N>)', '%<|(<N>)'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:163
+#, priority:260
msgid "respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:165
+#, priority:260
msgid "Placeholders that expand to information extracted from the commit:"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:165
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%H'"
msgstr "'%H'"
#. type: Plain text
#: en/pretty-formats.txt:166
+#, priority:260
msgid "commit hash"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:166
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%h'"
msgstr "'%h'"
#. type: Plain text
#: en/pretty-formats.txt:167
+#, priority:260
msgid "abbreviated commit hash"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:167
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%T'"
msgstr "'%T'"
#. type: Plain text
#: en/pretty-formats.txt:168
+#, priority:260
msgid "tree hash"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:168
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%t'"
msgstr "'%t'"
#. type: Plain text
#: en/pretty-formats.txt:169
+#, priority:260
msgid "abbreviated tree hash"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:169
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%P'"
msgstr "'%P'"
#. type: Plain text
#: en/pretty-formats.txt:170
+#, priority:260
msgid "parent hashes"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:170
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%p'"
msgstr "'%p'"
#. type: Plain text
#: en/pretty-formats.txt:171
+#, priority:260
msgid "abbreviated parent hashes"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:171
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%an'"
msgstr "'%an'"
#. type: Plain text
#: en/pretty-formats.txt:172
+#, priority:260
msgid "author name"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:172
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
#: en/pretty-formats.txt:173
+#, priority:260
msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:174 en/pretty-formats.txt:177
-#, fuzzy
+#, fuzzy, priority:260
msgid "or linkgit:git-blame[1])"
msgstr "linkgit:git-blame[1]"
#. type: Labeled list
#: en/pretty-formats.txt:174
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%ae'"
msgstr "'%ae'"
#. type: Plain text
#: en/pretty-formats.txt:175
+#, priority:260
msgid "author email"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:175
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
#: en/pretty-formats.txt:176
+#, priority:260
msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:177
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%al'"
msgstr "'%al'"
#. type: Plain text
#: en/pretty-formats.txt:178 en/pretty-formats.txt:194
+#, priority:260
msgid "author email local-part (the part before the '@' sign)"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:178
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
#: en/pretty-formats.txt:179
+#, priority:260
msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
+#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:180
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%ad'"
msgstr "'%ad'"
#. type: Plain text
#: en/pretty-formats.txt:181
+#, priority:260
msgid "author date (format respects --date= option)"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:181
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%aD'"
msgstr "'%aD'"
#. type: Plain text
#: en/pretty-formats.txt:182
+#, priority:260
msgid "author date, RFC2822 style"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:182
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%ar'"
msgstr "'%ar'"
#. type: Plain text
#: en/pretty-formats.txt:183
+#, priority:260
msgid "author date, relative"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:183
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%at'"
msgstr "'%at'"
#. type: Plain text
#: en/pretty-formats.txt:184
+#, priority:260
msgid "author date, UNIX timestamp"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:184
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%ai'"
msgstr "'%ai'"
#. type: Plain text
#: en/pretty-formats.txt:185
+#, priority:260
msgid "author date, ISO 8601-like format"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:185
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%aI'"
msgstr "'%aI'"
#. type: Plain text
#: en/pretty-formats.txt:186
+#, priority:260
msgid "author date, strict ISO 8601 format"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:186
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%as'"
msgstr "'%as'"
#. type: Plain text
#: en/pretty-formats.txt:187
+#, priority:260
msgid "author date, short format (`YYYY-MM-DD`)"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:187
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cn'"
msgstr "'%cn'"
#. type: Plain text
#: en/pretty-formats.txt:188
+#, priority:260
msgid "committer name"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:188
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
#: en/pretty-formats.txt:189
+#, priority:260
msgid "committer name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:190
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%ce'"
msgstr "'%ce'"
#. type: Plain text
#: en/pretty-formats.txt:191
+#, priority:260
msgid "committer email"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:191
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
#: en/pretty-formats.txt:192
+#, priority:260
msgid "committer email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:193
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cl'"
msgstr "'%cl'"
#. type: Labeled list
#: en/pretty-formats.txt:194
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
#: en/pretty-formats.txt:195
+#, priority:260
msgid "author local-part (see '%cl') respecting .mailmap, see"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:196
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cd'"
msgstr "'%cd'"
#. type: Plain text
#: en/pretty-formats.txt:197
+#, priority:260
msgid "committer date (format respects --date= option)"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:197
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cD'"
msgstr "'%cD'"
#. type: Plain text
#: en/pretty-formats.txt:198
+#, priority:260
msgid "committer date, RFC2822 style"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:198
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cr'"
msgstr "'%cr'"
#. type: Plain text
#: en/pretty-formats.txt:199
+#, priority:260
msgid "committer date, relative"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:199
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%ct'"
msgstr "'%ct'"
#. type: Plain text
#: en/pretty-formats.txt:200
+#, priority:260
msgid "committer date, UNIX timestamp"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:200
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%ci'"
msgstr "'%ci'"
#. type: Plain text
#: en/pretty-formats.txt:201
+#, priority:260
msgid "committer date, ISO 8601-like format"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:201
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cI'"
msgstr "'%cI'"
#. type: Plain text
#: en/pretty-formats.txt:202
+#, priority:260
msgid "committer date, strict ISO 8601 format"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:202
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%cs'"
msgstr "'%cs'"
#. type: Plain text
#: en/pretty-formats.txt:203
+#, priority:260
msgid "committer date, short format (`YYYY-MM-DD`)"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:203
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%d'"
msgstr "'%d'"
#. type: Plain text
#: en/pretty-formats.txt:204
+#, priority:260
msgid "ref names, like the --decorate option of linkgit:git-log[1]"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:204
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%D'"
msgstr "'%D'"
#. type: Plain text
#: en/pretty-formats.txt:205
+#, priority:260
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:206
+#, priority:260
msgid "ref name given on the command line by which the commit was reached"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:207
+#, priority:260
msgid "(like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:207
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%e'"
msgstr "'%e'"
#. type: Plain text
#: en/pretty-formats.txt:208
-#, fuzzy
+#, fuzzy, priority:260
msgid "encoding"
msgstr "`encoding`"
#. type: Plain text
#: en/pretty-formats.txt:209
+#, priority:260
msgid "subject"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:209
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%f'"
msgstr "'%f'"
#. type: Plain text
#: en/pretty-formats.txt:210
+#, priority:260
msgid "sanitized subject line, suitable for a filename"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:210
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%b'"
msgstr "'%b'"
#. type: Plain text
#: en/pretty-formats.txt:211
+#, priority:260
msgid "body"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:211
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%B'"
msgstr "'%B'"
#. type: Plain text
#: en/pretty-formats.txt:212
+#, priority:260
msgid "raw body (unwrapped subject and body)"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:213
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%N'"
msgstr "'%N'"
#. type: Plain text
#: en/pretty-formats.txt:214
+#, priority:260
msgid "commit notes"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:215
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%GG'"
msgstr "'%GG'"
#. type: Plain text
#: en/pretty-formats.txt:216
+#, priority:260
msgid "raw verification message from GPG for a signed commit"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:216
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:260
msgid "'%G?'"
msgstr "'%GG'"
#. type: Plain text
#: en/pretty-formats.txt:217
+#, priority:260
msgid "show \"G\" for a good (valid) signature,"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:224
-msgid ""
-"\"B\" for a bad signature, \"U\" for a good signature with unknown validity, "
-"\"X\" for a good signature that has expired, \"Y\" for a good signature made "
-"by an expired key, \"R\" for a good signature made by a revoked key, \"E\" "
-"if the signature cannot be checked (e.g. missing key) and \"N\" for no "
-"signature"
+#, priority:260
+msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:224
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%GS'"
msgstr "'%GS'"
#. type: Plain text
#: en/pretty-formats.txt:225
+#, priority:260
msgid "show the name of the signer for a signed commit"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:225
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%GK'"
msgstr "'%GK'"
#. type: Plain text
#: en/pretty-formats.txt:226
+#, priority:260
msgid "show the key used to sign a signed commit"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:226
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%GF'"
msgstr "'%GF'"
#. type: Plain text
#: en/pretty-formats.txt:227
+#, priority:260
msgid "show the fingerprint of the key used to sign a signed commit"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:227
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "'%GP'"
msgstr "'%GP'"
#. type: Plain text
#: en/pretty-formats.txt:228
+#, priority:260
msgid "show the fingerprint of the primary key whose subkey was used"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:229
+#, priority:260
msgid "to sign a signed commit"
msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
-#, no-wrap
+#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
+#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid ""
-"minutes ago}`; the format follows the rules described for the `-g` "
-"option. The portion before the `@` is the refname as given on the command "
-"line (so `git log -g refs/heads/master` would yield "
-"`refs/heads/master@{0}`)."
+#: en/pretty-formats.txt:235
+#, priority:260
+msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
-#, no-wrap
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
+#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid ""
-"portion is shortened for human readability (so `refs/heads/master` becomes "
-"just `master`)."
+#: en/pretty-formats.txt:238
+#, priority:260
+msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
-#, no-wrap
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
+#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
-#, no-wrap
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
+#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
-#, no-wrap
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
+#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
-#, no-wrap
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
+#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
-#, no-wrap
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
+#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
-#, no-wrap
+#: en/pretty-formats.txt:245
+#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
+#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid ""
-"interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may "
-"be followed by a colon and zero or more comma-separated options:"
+#: en/pretty-formats.txt:250
+#, priority:260
+msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
-msgid ""
-"'key=<K>': only show trailers with specified key. Matching is done "
-"case-insensitively and trailing colon is optional. If option is given "
-"multiple times trailer lines matching any of the keys are shown. This option "
-"automatically enables the `only` option so that non-trailer lines in the "
-"trailer block are hidden. If that is not desired it can be disabled with "
-"`only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with "
-"key `Reviewed-by`."
+#: en/pretty-formats.txt:258
+#, priority:260
+msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
-msgid ""
-"'only[=val]': select whether non-trailer lines from the trailer block should "
-"be included. The `only` keyword may optionally be followed by an equal sign "
-"and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the "
-"non-trailer lines. If option is given without value it is enabled. If given "
-"multiple times the last value is used."
+#: en/pretty-formats.txt:264
+#, priority:260
+msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
-msgid ""
-"'separator=<SEP>': specify a separator inserted between trailer lines. When "
-"this option is not given each trailer line is terminated with a line feed "
-"character. The string SEP may contain the literal formatting codes described "
-"above. To use comma as separator one must use `%x2C` as it would otherwise "
-"be parsed as next option. If separator option is given multiple times only "
-"the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows "
-"all trailer lines whose key is \"Ticket\" separated by a comma and a space."
+#: en/pretty-formats.txt:273
+#, priority:260
+msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
-msgid ""
-"'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option "
-"was given. In same way as to for `only` it can be followed by an equal sign "
-"and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows "
-"all trailer lines."
+#: en/pretty-formats.txt:277
+#, priority:260
+msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
-msgid ""
-"'valueonly[=val]': skip over the key part of the trailer line and only show "
-"the value part. Also this optionally allows explicit value."
+#: en/pretty-formats.txt:279
+#, priority:260
+msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
-msgid ""
-"Some placeholders may depend on other options given to the revision "
-"traversal engine. For example, the `%g*` reflog options will insert an empty "
-"string unless we are traversing reflog entries (e.g., by `git log -g`). The "
-"`%d` and `%D` placeholders will use the \"short\" decoration format if "
-"`--decorate` was not already provided on the command line."
+#: en/pretty-formats.txt:286
+#, priority:260
+msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
-msgid ""
-"If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is "
-"inserted immediately before the expansion if and only if the placeholder "
-"expands to a non-empty string."
+#: en/pretty-formats.txt:290
+#, priority:260
+msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
-msgid ""
-"If you add a `-` (minus sign) after '%' of a placeholder, all consecutive "
-"line-feeds immediately preceding the expansion are deleted if and only if "
-"the placeholder expands to an empty string."
+#: en/pretty-formats.txt:294
+#, priority:260
+msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
-msgid ""
-"If you add a ` ` (space) after '%' of a placeholder, a space is inserted "
-"immediately before the expansion if and only if the placeholder expands to a "
-"non-empty string."
+#: en/pretty-formats.txt:298
+#, priority:260
+msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
+#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
-msgid ""
-"The 'tformat:' format works exactly like 'format:', except that it provides "
-"\"terminator\" semantics instead of \"separator\" semantics. In other words, "
-"each commit has the message terminator character (usually a newline) "
-"appended, rather than a separator placed between entries. This means that "
-"the final entry of a single-line format will be properly terminated with a "
-"new line, just as the \"oneline\" format does. For example:"
+#: en/pretty-formats.txt:308
+#, priority:260
+msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
-#, no-wrap
+#: en/pretty-formats.txt:314
+#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
" | perl -pe '$_ .= \" -- NO NEWLINE\\n\" unless /\\n/'\n"
@@ -69302,8 +59391,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
-#, no-wrap
+#: en/pretty-formats.txt:319
+#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
" | perl -pe '$_ .= \" -- NO NEWLINE\\n\" unless /\\n/'\n"
@@ -69312,15 +59401,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
-msgid ""
-"In addition, any unrecognized string that has a `%` in it is interpreted as "
-"if it has `tformat:` in front of it. For example, these two are equivalent:"
+#: en/pretty-formats.txt:324
+#, priority:260
+msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
-#, no-wrap
+#: en/pretty-formats.txt:328
+#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
"$ git log -2 --pretty=%h 4da45bef\n"
@@ -69328,596 +59416,457 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:1
-#, no-wrap
+#, no-wrap, priority:260
msgid "--pretty[=<format>]"
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:10
-msgid ""
-"Pretty-print the contents of the commit logs in a given format, where "
-"'<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', "
-"'reference', 'email', 'raw', 'format:<string>' and 'tformat:<string>'. When "
-"'<format>' is none of the above, and has '%placeholder' in it, it acts as if "
-"'--pretty=tformat:<format>' were given."
+#, priority:260
+msgid "Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw', 'format:<string>' and 'tformat:<string>'. When '<format>' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:<format>' were given."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:13
-msgid ""
-"See the \"PRETTY FORMATS\" section for some additional details for each "
-"format. When '=<format>' part is omitted, it defaults to 'medium'."
+#, priority:260
+msgid "See the \"PRETTY FORMATS\" section for some additional details for each format. When '=<format>' part is omitted, it defaults to 'medium'."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:16
-msgid ""
-"Note: you can specify the default pretty format in the repository "
-"configuration (see linkgit:git-config[1])."
+#, priority:260
+msgid "Note: you can specify the default pretty format in the repository configuration (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--abbrev-commit"
msgstr "--abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:22
-msgid ""
-"Instead of showing the full 40-byte hexadecimal commit object name, show "
-"only a partial prefix. Non default number of digits can be specified with "
-"\"--abbrev=<n>\" (which also modifies diff output, if it is displayed)."
+#, priority:260
+msgid "Instead of showing the full 40-byte hexadecimal commit object name, show only a partial prefix. Non default number of digits can be specified with \"--abbrev=<n>\" (which also modifies diff output, if it is displayed)."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:25
-msgid ""
-"This should make \"--pretty=oneline\" a whole lot more readable for people "
-"using 80-column terminals."
+#, priority:260
+msgid "This should make \"--pretty=oneline\" a whole lot more readable for people using 80-column terminals."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev-commit"
msgstr "--no-abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:30
-msgid ""
-"Show the full 40-byte hexadecimal commit object name. This negates "
-"`--abbrev-commit` and those options which imply it such as \"--oneline\". It "
-"also overrides the `log.abbrevCommit` variable."
+#, priority:260
+msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit` and those options which imply it such as \"--oneline\". It also overrides the `log.abbrevCommit` variable."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:34
+#, priority:260
msgid "This is a shorthand for \"--pretty=oneline --abbrev-commit\" used together."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:44
-msgid ""
-"The commit objects record the encoding used for the log message in their "
-"encoding header; this option can be used to tell the command to re-code the "
-"commit log message in the encoding preferred by the user. For non plumbing "
-"commands this defaults to UTF-8. Note that if an object claims to be encoded "
-"in `X` and we are outputting in `X`, we will output the object verbatim; "
-"this means that invalid sequences in the original commit may be copied to "
-"the output."
+#, priority:260
+msgid "The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF-8. Note that if an object claims to be encoded in `X` and we are outputting in `X`, we will output the object verbatim; this means that invalid sequences in the original commit may be copied to the output."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:45
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:260
msgid "--expand-tabs=<n>"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:46
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--expand-tabs"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-expand-tabs"
msgstr "--no-expand-tabs"
#. type: Plain text
#: en/pretty-options.txt:54
-msgid ""
-"Perform a tab expansion (replace each tab with enough spaces to fill to the "
-"next display column that is multiple of '<n>') in the log message before "
-"showing it in the output. `--expand-tabs` is a short-hand for "
-"`--expand-tabs=8`, and `--no-expand-tabs` is a short-hand for "
-"`--expand-tabs=0`, which disables tab expansion."
+#, priority:260
+msgid "Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of '<n>') in the log message before showing it in the output. `--expand-tabs` is a short-hand for `--expand-tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which disables tab expansion."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:58
-msgid ""
-"By default, tabs are expanded in pretty formats that indent the log message "
-"by 4 spaces (i.e. 'medium', which is the default, 'full', and 'fuller')."
+#, priority:260
+msgid "By default, tabs are expanded in pretty formats that indent the log message by 4 spaces (i.e. 'medium', which is the default, 'full', and 'fuller')."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:66
-msgid ""
-"Show the notes (see linkgit:git-notes[1]) that annotate the commit, when "
-"showing the commit log message. This is the default for `git log`, `git "
-"show` and `git whatchanged` commands when there is no `--pretty`, "
-"`--format`, or `--oneline` option given on the command line."
+#, priority:260
+msgid "Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when there is no `--pretty`, `--format`, or `--oneline` option given on the command line."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:70
-msgid ""
-"By default, the notes shown are from the notes refs listed in the "
-"`core.notesRef` and `notes.displayRef` variables (or corresponding "
-"environment overrides). See linkgit:git-config[1] for more details."
+#, priority:260
+msgid "By default, the notes shown are from the notes refs listed in the `core.notesRef` and `notes.displayRef` variables (or corresponding environment overrides). See linkgit:git-config[1] for more details."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:75
-msgid ""
-"With an optional '<ref>' argument, use the ref to find the notes to "
-"display. The ref can specify 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."
+#, priority:260
+msgid "With an optional '<ref>' argument, use the ref to find the notes to display. The ref can specify 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/pretty-options.txt:80
-msgid ""
-"Multiple --notes options can be combined to control which notes are being "
-"displayed. Examples: \"--notes=foo\" will show only notes from "
-"\"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from "
-"\"refs/notes/foo\" and from the default notes ref(s)."
+#, priority:260
+msgid "Multiple --notes options can be combined to control which notes are being displayed. Examples: \"--notes=foo\" will show only notes from \"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from \"refs/notes/foo\" and from the default notes ref(s)."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:87
-msgid ""
-"Do not show notes. This negates the above `--notes` option, by resetting the "
-"list of notes refs from which notes are shown. Options are parsed in the "
-"order given on the command line, so e.g. \"--notes --notes=foo --no-notes "
-"--notes=bar\" will only show notes from \"refs/notes/bar\"."
+#, priority:260
+msgid "Do not show notes. This negates the above `--notes` option, by resetting the list of notes refs from which notes are shown. Options are parsed in the order given on the command line, so e.g. \"--notes --notes=foo --no-notes --notes=bar\" will only show notes from \"refs/notes/bar\"."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:88
-#, no-wrap
+#, no-wrap, priority:260
msgid "--show-notes[=<ref>]"
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--[no-]standard-notes"
msgstr "--[no-]standard-notes"
#. type: Plain text
#: en/pretty-options.txt:92
-msgid ""
-"These options are deprecated. Use the above --notes/--no-notes options "
-"instead."
+#, priority:260
+msgid "These options are deprecated. Use the above --notes/--no-notes options instead."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--show-signature"
msgstr "--show-signature"
#. type: Plain text
#: en/pretty-options.txt:96
-msgid ""
-"Check the validity of a signed commit object by passing the signature to "
-"`gpg --verify` and show the output."
+#, priority:260
+msgid "Check the validity of a signed commit object by passing the signature to `gpg --verify` and show the output."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:6
-msgid ""
-"The \"remote\" repository that is the source of a fetch or pull operation. "
-"This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) "
-"or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
+#, priority:220
+msgid "The \"remote\" repository that is the source of a fetch or pull operation. This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
msgstr ""
#. type: Labeled list
#: en/pull-fetch-param.txt:8
-#, no-wrap
+#, no-wrap, priority:220
msgid "<group>"
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:12
-msgid ""
-"A name referring to a list of repositories as the value of remotes.<group> "
-"in the configuration file. (See linkgit:git-config[1])."
+#, priority:220
+msgid "A name referring to a list of repositories as the value of remotes.<group> in the configuration file. (See linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
#: en/pull-fetch-param.txt:14
-#, fuzzy, no-wrap
+#, fuzzy, no-wrap, priority:220
msgid "<refspec>"
msgstr "refspec"
#. type: Plain text
#: en/pull-fetch-param.txt:18
-msgid ""
-"Specifies which refs to fetch and which local refs to update. When no "
-"<refspec>s appear on the command line, the refs to fetch are read from "
-"`remote.<repository>.fetch` variables instead"
+#, priority:220
+msgid "Specifies which refs to fetch and which local refs to update. When no <refspec>s appear on the command line, the refs to fetch are read from `remote.<repository>.fetch` variables instead"
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:20
-#, no-wrap
+#, no-wrap, priority:220
msgid "\t(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).\n"
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:23
-#, no-wrap
+#, no-wrap, priority:220
msgid "\t(see linkgit:git-fetch[1]).\n"
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:31
-msgid ""
-"The format of a <refspec> parameter is an optional plus `+`, followed by the "
-"source <src>, followed by a colon `:`, followed by the destination ref "
-"<dst>. The colon can be omitted when <dst> is empty. <src> is typically a "
-"ref, but it can also be a fully spelled hex object name."
+#, priority:220
+msgid "The format of a <refspec> parameter is an optional plus `+`, followed by the source <src>, followed by a colon `:`, followed by the destination ref <dst>. The colon can be omitted when <dst> is empty. <src> is typically a ref, but it can also be a fully spelled hex object name."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:34
-msgid ""
-"`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests "
-"fetching everything up to the given tag."
+#, priority:220
+msgid "`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests fetching everything up to the given tag."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:38
-msgid ""
-"The remote ref that matches <src> is fetched, and if <dst> is not an empty "
-"string, an attempt is made to update the local ref that matches it."
+#, priority:220
+msgid "The remote ref that matches <src> is fetched, and if <dst> is not an empty string, an attempt is made to update the local ref that matches it."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:45
-msgid ""
-"Whether that update is allowed without `--force` depends on the ref "
-"namespace it's being fetched to, the type of object being fetched, and "
-"whether the update is considered to be a fast-forward. Generally, the same "
-"rules apply for fetching as when pushing, see the `<refspec>...` section of "
-"linkgit:git-push[1] for what those are. Exceptions to those rules particular "
-"to 'git fetch' are noted below."
+#, ignore-ellipsis, priority:220
+msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:53
-msgid ""
-"Until Git version 2.20, and unlike when pushing with linkgit:git-push[1], "
-"any updates to `refs/tags/*` would be accepted without `+` in the refspec "
-"(or `--force`). When fetching, we promiscuously considered all tag updates "
-"from a remote to be forced fetches. Since Git version 2.20, fetching to "
-"update `refs/tags/*` works the same way as when pushing. I.e. any updates "
-"will be rejected without `+` in the refspec (or `--force`)."
+#, priority:220
+msgid "Until Git version 2.20, and unlike when pushing with linkgit:git-push[1], any updates to `refs/tags/*` would be accepted without `+` in the refspec (or `--force`). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches. Since Git version 2.20, fetching to update `refs/tags/*` works the same way as when pushing. I.e. any updates will be rejected without `+` in the refspec (or `--force`)."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:59
-msgid ""
-"Unlike when pushing with linkgit:git-push[1], any updates outside of "
-"`refs/{tags,heads}/*` will be accepted without `+` in the refspec (or "
-"`--force`), whether that's swapping e.g. a tree object for a blob, or a "
-"commit for another commit that's doesn't have the previous commit as an "
-"ancestor etc."
+#, priority:220
+msgid "Unlike when pushing with linkgit:git-push[1], any updates outside of `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or `--force`), whether that's swapping e.g. a tree object for a blob, or a commit for another commit that's doesn't have the previous commit as an ancestor etc."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:63
-msgid ""
-"Unlike when pushing with linkgit:git-push[1], there is no configuration "
-"which'll amend these rules, and nothing like a `pre-fetch` hook analogous to "
-"the `pre-receive` hook."
+#, priority:220
+msgid "Unlike when pushing with linkgit:git-push[1], there is no configuration which'll amend these rules, and nothing like a `pre-fetch` hook analogous to the `pre-receive` hook."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:70
-msgid ""
-"As with pushing with linkgit:git-push[1], all of the rules described above "
-"about what's not allowed as an update can be overridden by adding an the "
-"optional leading `+` to a refspec (or using `--force` command line "
-"option). The only exception to this is that no amount of forcing will make "
-"the `refs/heads/*` namespace accept a non-commit object."
+#, priority:220
+msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an the optional leading `+` to a refspec (or using `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:82
-msgid ""
-"When the remote branch you want to fetch is known to be rewound and rebased "
-"regularly, it is expected that its new tip will not be descendant of its "
-"previous tip (as stored in your remote-tracking branch the last time you "
-"fetched). You would want to use the `+` sign to indicate non-fast-forward "
-"updates will be needed for such branches. There is no way to determine or "
-"declare that a branch will be made available in a repository with this "
-"behavior; the pulling user simply must know this is the expected usage "
-"pattern for a branch."
+#, priority:220
+msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:102
-msgid ""
-"There is a difference between listing multiple <refspec> directly on 'git "
-"pull' command line and having multiple `remote.<repository>.fetch` entries "
-"in your configuration for a <repository> and running a 'git pull' command "
-"without any explicit <refspec> parameters. <refspec>s listed explicitly on "
-"the command line are always merged into the current branch after fetching. "
-"In other words, if you list more than one remote ref, 'git pull' will create "
-"an Octopus merge. On the other hand, if you do not list any explicit "
-"<refspec> parameter on the command line, 'git pull' will fetch all the "
-"<refspec>s it finds in the `remote.<repository>.fetch` configuration and "
-"merge only the first <refspec> found into the current branch. This is "
-"because making an Octopus from remote refs is rarely done, while keeping "
-"track of multiple remote heads in one-go by fetching more than one is often "
-"useful."
+#, priority:220
+msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
msgstr ""
#. type: Title -
#: en/revisions.txt:2
-#, no-wrap
+#, no-wrap, priority:100
msgid "SPECIFYING REVISIONS"
msgstr ""
#. type: Plain text
#: en/revisions.txt:9
-msgid ""
-"A revision parameter '<rev>' typically, but not necessarily, names a commit "
-"object. It uses what is called an 'extended SHA-1' syntax. Here are "
-"various ways to spell object names. The ones listed near the end of this "
-"list name trees and blobs contained in a commit."
+#, priority:100
+msgid "A revision parameter '<rev>' typically, but not necessarily, names a commit object. It uses what is called an 'extended SHA-1' syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit."
msgstr ""
#. type: Plain text
#: en/revisions.txt:13
-msgid ""
-"This document shows the \"raw\" syntax as seen by git. The shell and other "
-"UIs might require additional quoting to protect special characters and to "
-"avoid word splitting."
+#, priority:100
+msgid "This document shows the \"raw\" syntax as seen by git. The shell and other UIs might require additional quoting to protect special characters and to avoid word splitting."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:14
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<sha1>', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:20
-msgid ""
-"The full SHA-1 object name (40-byte hexadecimal string), or a leading "
-"substring that is unique within the repository. "
-"E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same "
-"commit object if there is no other object in your repository whose object "
-"name starts with dae86e."
+#, priority:100
+msgid "The full SHA-1 object name (40-byte hexadecimal string), or a leading substring that is unique within the repository. E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same commit object if there is no other object in your repository whose object name starts with dae86e."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:21
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<describeOutput>', e.g. 'v1.7.4.2-679-g3bee7fb'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:25
-msgid ""
-"Output from `git describe`; i.e. a closest tag, optionally followed by a "
-"dash and a number of commits, followed by a dash, a 'g', and an abbreviated "
-"object name."
+#, priority:100
+msgid "Output from `git describe`; i.e. a closest tag, optionally followed by a dash and a number of commits, followed by a dash, a 'g', and an abbreviated object name."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:26
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<refname>', e.g. 'master', 'heads/master', 'refs/heads/master'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:33
-msgid ""
-"A symbolic ref name. E.g. 'master' typically means the commit object "
-"referenced by 'refs/heads/master'. If you happen to have both "
-"'heads/master' and 'tags/master', you can explicitly say 'heads/master' to "
-"tell Git which one you mean. When ambiguous, a '<refname>' is disambiguated "
-"by taking the first match in the following rules:"
+#, priority:100
+msgid "A symbolic ref name. E.g. 'master' typically means the commit object referenced by 'refs/heads/master'. If you happen to have both 'heads/master' and 'tags/master', you can explicitly say 'heads/master' to tell Git which one you mean. When ambiguous, a '<refname>' is disambiguated by taking the first match in the following rules:"
msgstr ""
#. type: Plain text
#: en/revisions.txt:37
-msgid ""
-"If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually "
-"useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD` and "
-"`CHERRY_PICK_HEAD`);"
+#, priority:100
+msgid "If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD` and `CHERRY_PICK_HEAD`);"
msgstr ""
#. type: Plain text
#: en/revisions.txt:39
+#, priority:100
msgid "otherwise, 'refs/<refname>' if it exists;"
msgstr ""
#. type: Plain text
#: en/revisions.txt:41
+#, priority:100
msgid "otherwise, 'refs/tags/<refname>' if it exists;"
msgstr ""
#. type: Plain text
#: en/revisions.txt:43
+#, priority:100
msgid "otherwise, 'refs/heads/<refname>' if it exists;"
msgstr ""
#. type: Plain text
#: en/revisions.txt:45
+#, priority:100
msgid "otherwise, 'refs/remotes/<refname>' if it exists;"
msgstr ""
#. type: Plain text
#: en/revisions.txt:47
+#, priority:100
msgid "otherwise, 'refs/remotes/<refname>/HEAD' if it exists."
msgstr ""
#. type: Plain text
#: en/revisions.txt:59
-msgid ""
-"`HEAD` names the commit on which you based the changes in the working tree. "
-"`FETCH_HEAD` records the branch which you fetched from a remote repository "
-"with your last `git fetch` invocation. `ORIG_HEAD` is created by commands "
-"that move your `HEAD` in a drastic way, to record the position of the `HEAD` "
-"before their operation, so that you can easily change the tip of the branch "
-"back to the state before you ran them. `MERGE_HEAD` records the commit(s) "
-"which you are merging into your branch when you run `git merge`. "
-"`CHERRY_PICK_HEAD` records the commit which you are cherry-picking when you "
-"run `git cherry-pick`."
+#, priority:100
+msgid "`HEAD` names the commit on which you based the changes in the working tree. `FETCH_HEAD` records the branch which you fetched from a remote repository with your last `git fetch` invocation. `ORIG_HEAD` is created by commands that move your `HEAD` in a drastic way, to record the position of the `HEAD` before their operation, so that you can easily change the tip of the branch back to the state before you ran them. `MERGE_HEAD` records the commit(s) which you are merging into your branch when you run `git merge`. `CHERRY_PICK_HEAD` records the commit which you are cherry-picking when you run `git cherry-pick`."
msgstr ""
#. type: Plain text
#: en/revisions.txt:64
-msgid ""
-"Note that any of the 'refs/*' cases above may come either from the "
-"`$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file. While "
-"the ref name encoding is unspecified, UTF-8 is preferred as some output "
-"processing may assume ref names in UTF-8."
+#, priority:100
+msgid "Note that any of the 'refs/*' cases above may come either from the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file. While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:65
-#, no-wrap
+#, no-wrap, priority:100
msgid "'@'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:67
+#, priority:100
msgid "'@' alone is a shortcut for `HEAD`."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:68
-#, no-wrap
-msgid ""
-"'[<refname>]@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes "
-"ago}'"
+#, no-wrap, priority:100
+msgid "'[<refname>]@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:79
-msgid ""
-"A ref followed by the suffix '@' with a date specification enclosed in a "
-"brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second "
-"ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior "
-"point in time. This suffix may only be used immediately following a ref "
-"name and the ref must have an existing log ('$GIT_DIR/logs/<ref>'). Note "
-"that this looks up the state of your *local* ref at a given time; e.g., what "
-"was in your local 'master' branch last week. If you want to look at commits "
-"made during certain times, see `--since` and `--until`."
+#, priority:100
+msgid "A ref followed by the suffix '@' with a date specification enclosed in a brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior point in time. This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state of your *local* ref at a given time; e.g., what was in your local 'master' branch last week. If you want to look at commits made during certain times, see `--since` and `--until`."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:80
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<refname>@{<n>}', e.g. 'master@\\{1\\}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:88
-msgid ""
-"A ref followed by the suffix '@' with an ordinal specification enclosed in a "
-"brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of "
-"that ref. For example 'master@\\{1\\}' is the immediate prior value of "
-"'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This "
-"suffix may only be used immediately following a ref name and the ref must "
-"have an existing log ('$GIT_DIR/logs/<refname>')."
+#, priority:100
+msgid "A ref followed by the suffix '@' with an ordinal specification enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of that ref. For example 'master@\\{1\\}' is the immediate prior value of 'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<refname>')."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:89
-#, no-wrap
+#, no-wrap, priority:100
msgid "'@{<n>}', e.g. '@\\{1\\}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:93
-msgid ""
-"You can use the '@' construct with an empty ref part to get at a reflog "
-"entry of the current branch. For example, if you are on branch 'blabla' then "
-"'@\\{1\\}' means the same as 'blabla@\\{1\\}'."
+#, priority:100
+msgid "You can use the '@' construct with an empty ref part to get at a reflog entry of the current branch. For example, if you are on branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:94
-#, no-wrap
+#, no-wrap, priority:100
msgid "'@{-<n>}', e.g. '@{-1}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:97
-msgid ""
-"The construct '@{-<n>}' means the <n>th branch/commit checked out before the "
-"current one."
+#, priority:100
+msgid "The construct '@{-<n>}' means the <n>th branch/commit checked out before the current one."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:98
-#, no-wrap
+#, no-wrap, priority:100
msgid "'[<branchname>]@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:105
-msgid ""
-"The suffix '@\\{upstream\\}' to a branchname (short form "
-"'<branchname>@\\{u\\}') refers to the branch that the branch specified by "
-"branchname is set to build on top of (configured with `branch.<name>.remote` "
-"and `branch.<name>.merge`). A missing branchname defaults to the current "
-"one. These suffixes are also accepted when spelled in uppercase, and they "
-"mean the same thing no matter the case."
+#, priority:100
+msgid "The suffix '@\\{upstream\\}' to a branchname (short form '<branchname>@\\{u\\}') refers to the branch that the branch specified by branchname is set to build on top of (configured with `branch.<name>.remote` and `branch.<name>.merge`). A missing branchname defaults to the current one. These suffixes are also accepted when spelled in uppercase, and they mean the same thing no matter the case."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:106
-#, no-wrap
+#, no-wrap, priority:100
msgid "'[<branchname>]@\\{push\\}', e.g. 'master@\\{push\\}', '@\\{push\\}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:112
-msgid ""
-"The suffix '@\\{push}' reports the branch \"where we would push to\" if `git "
-"push` were run while `branchname` was checked out (or the current `HEAD` if "
-"no branchname is specified). Since our push destination is in a remote "
-"repository, of course, we report the local tracking branch that corresponds "
-"to that branch (i.e., something in `refs/remotes/`)."
+#, priority:100
+msgid "The suffix '@\\{push}' reports the branch \"where we would push to\" if `git push` were run while `branchname` was checked out (or the current `HEAD` if no branchname is specified). Since our push destination is in a remote repository, of course, we report the local tracking branch that corresponds to that branch (i.e., something in `refs/remotes/`)."
msgstr ""
#. type: Plain text
#: en/revisions.txt:114
+#, priority:100
msgid "Here's an example to make it more clear:"
msgstr ""
#. type: delimited block -
#: en/revisions.txt:119
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git config push.default current\n"
"$ git config remote.pushdefault myfork\n"
@@ -69926,7 +59875,7 @@ msgstr ""
#. type: delimited block -
#: en/revisions.txt:122
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git rev-parse --symbolic-full-name @{upstream}\n"
"refs/remotes/origin/master\n"
@@ -69934,7 +59883,7 @@ msgstr ""
#. type: delimited block -
#: en/revisions.txt:125
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"$ git rev-parse --symbolic-full-name @{push}\n"
"refs/remotes/myfork/mybranch\n"
@@ -69942,181 +59891,133 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:130
-msgid ""
-"Note in the example that we set up a triangular workflow, where we pull from "
-"one location and push to another. In a non-triangular workflow, '@\\{push}' "
-"is the same as '@\\{upstream}', and there is no need for it."
+#, priority:100
+msgid "Note in the example that we set up a triangular workflow, where we pull from one location and push to another. In a non-triangular workflow, '@\\{push}' is the same as '@\\{upstream}', and there is no need for it."
msgstr ""
#. type: Plain text
#: en/revisions.txt:133
-msgid ""
-"This suffix is also accepted when spelled in uppercase, and means the same "
-"thing no matter the case."
+#, priority:100
+msgid "This suffix is also accepted when spelled in uppercase, and means the same thing no matter the case."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:134
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>{caret}[<n>]', e.g. 'HEAD{caret}, v1.5.1{caret}0'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:141
-msgid ""
-"A suffix '{caret}' to a revision parameter means the first parent of that "
-"commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is "
-"equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means "
-"the commit itself and is used when '<rev>' is the object name of a tag "
-"object that refers to a commit object."
+#, priority:100
+msgid "A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means the commit itself and is used when '<rev>' is the object name of a tag object that refers to a commit object."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:142
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>{tilde}[<n>]', e.g. 'HEAD{tilde}, master{tilde}3'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:151
-msgid ""
-"A suffix '{tilde}' to a revision parameter means the first parent of that "
-"commit object. A suffix '{tilde}<n>' to a revision parameter means the "
-"commit object that is the <n>th generation ancestor of the named commit "
-"object, following only the first parents. I.e. '<rev>{tilde}3' is "
-"equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to "
-"'<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage "
-"of this form."
+#, priority:100
+msgid "A suffix '{tilde}' to a revision parameter means the first parent of that commit object. A suffix '{tilde}<n>' to a revision parameter means the commit object that is the <n>th generation ancestor of the named commit object, following only the first parents. I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage of this form."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:152
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>{caret}{<type>}', e.g. 'v0.99.8{caret}\\{commit\\}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:163
-msgid ""
-"A suffix '{caret}' followed by an object type name enclosed in brace pair "
-"means dereference the object at '<rev>' recursively until an object of type "
-"'<type>' is found or the object cannot be dereferenced anymore (in which "
-"case, barf). For example, if '<rev>' is a commit-ish, "
-"'<rev>{caret}\\{commit\\}' describes the corresponding commit object. "
-"Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the "
-"corresponding tree object. '<rev>{caret}0' is a short-hand for "
-"'<rev>{caret}\\{commit\\}'."
+#, priority:100
+msgid "A suffix '{caret}' followed by an object type name enclosed in brace pair means dereference the object at '<rev>' recursively until an object of type '<type>' is found or the object cannot be dereferenced anymore (in which case, barf). For example, if '<rev>' is a commit-ish, '<rev>{caret}\\{commit\\}' describes the corresponding commit object. Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the corresponding tree object. '<rev>{caret}0' is a short-hand for '<rev>{caret}\\{commit\\}'."
msgstr ""
#. type: Plain text
#: en/revisions.txt:168
-msgid ""
-"'<rev>{caret}\\{object\\}' can be used to make sure '<rev>' names an object "
-"that exists, without requiring '<rev>' to be a tag, and without "
-"dereferencing '<rev>'; because a tag is already an object, it does not have "
-"to be dereferenced even once to get to an object."
+#, priority:100
+msgid "'<rev>{caret}\\{object\\}' can be used to make sure '<rev>' names an object that exists, without requiring '<rev>' to be a tag, and without dereferencing '<rev>'; because a tag is already an object, it does not have to be dereferenced even once to get to an object."
msgstr ""
#. type: Plain text
#: en/revisions.txt:171
-msgid ""
-"'<rev>{caret}\\{tag\\}' can be used to ensure that '<rev>' identifies an "
-"existing tag object."
+#, priority:100
+msgid "'<rev>{caret}\\{tag\\}' can be used to ensure that '<rev>' identifies an existing tag object."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:172
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>{caret}{}', e.g. 'v0.99.8{caret}{}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:177
-msgid ""
-"A suffix '{caret}' followed by an empty brace pair means the object could be "
-"a tag, and dereference the tag recursively until a non-tag object is found."
+#, priority:100
+msgid "A suffix '{caret}' followed by an empty brace pair means the object could be a tag, and dereference the tag recursively until a non-tag object is found."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:178
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>{caret}{/<text>}', e.g. 'HEAD^{/fix nasty bug}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:184
-msgid ""
-"A suffix '{caret}' to a revision parameter, followed by a brace pair that "
-"contains a text led by a slash, is the same as the ':/fix nasty bug' syntax "
-"below except that it returns the youngest matching commit which is reachable "
-"from the '<rev>' before '{caret}'."
+#, priority:100
+msgid "A suffix '{caret}' to a revision parameter, followed by a brace pair that contains a text led by a slash, is the same as the ':/fix nasty bug' syntax below except that it returns the youngest matching commit which is reachable from the '<rev>' before '{caret}'."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:185
-#, no-wrap
+#, no-wrap, priority:100
msgid "':/<text>', e.g. ':/fix nasty bug'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:198
-msgid ""
-"A colon, followed by a slash, followed by a text, names a commit whose "
-"commit message matches the specified regular expression. This name returns "
-"the youngest matching commit which is reachable from any ref, including "
-"HEAD. The regular expression can match any part of the commit message. To "
-"match messages starting with a string, one can use e.g. ':/^foo'. The "
-"special sequence ':/!' is reserved for modifiers to what is "
-"matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a "
-"literal '!' character, followed by 'foo'. Any other sequence beginning with "
-"':/!' is reserved for now. Depending on the given text, the shell's word "
-"splitting rules might require additional quoting."
+#, priority:100
+msgid "A colon, followed by a slash, followed by a text, names a commit whose commit message matches the specified regular expression. This name returns the youngest matching commit which is reachable from any ref, including HEAD. The regular expression can match any part of the commit message. To match messages starting with a string, one can use e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a literal '!' character, followed by 'foo'. Any other sequence beginning with ':/!' is reserved for now. Depending on the given text, the shell's word splitting rules might require additional quoting."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:199
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>:<path>', e.g. 'HEAD:README', 'master:./README'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:207
-msgid ""
-"A suffix ':' followed by a path names the blob or tree at the given path in "
-"the tree-ish object named by the part before the colon. A path starting "
-"with './' or '../' is relative to the current working directory. The given "
-"path will be converted to be relative to the working tree's root directory. "
-"This is most useful to address a blob or tree from a commit or tree that has "
-"the same tree structure as the working tree."
+#, priority:100
+msgid "A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon. A path starting with './' or '../' is relative to the current working directory. The given path will be converted to be relative to the working tree's root directory. This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:208
-#, no-wrap
+#, no-wrap, priority:100
msgid "':[<n>:]<path>', e.g. ':0:README', ':README'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:216
-msgid ""
-"A colon, optionally followed by a stage number (0 to 3) and a colon, "
-"followed by a path, names a blob object in the index at the given path. A "
-"missing stage number (and the colon that follows it) names a stage 0 "
-"entry. During a merge, stage 1 is the common ancestor, stage 2 is the target "
-"branch's version (typically the current branch), and stage 3 is the version "
-"from the branch which is being merged."
+#, priority:100
+msgid "A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path, names a blob object in the index at the given path. A missing stage number (and the colon that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch which is being merged."
msgstr ""
#. type: Plain text
#: en/revisions.txt:220
-msgid ""
-"Here is an illustration, by Jon Loeliger. Both commit nodes B and C are "
-"parents of commit node A. Parent commits are ordered left-to-right."
+#, priority:100
+msgid "Here is an illustration, by Jon Loeliger. Both commit nodes B and C are parents of commit node A. Parent commits are ordered left-to-right."
msgstr ""
#. type: delimited block .
#: en/revisions.txt:232
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
"G H I J\n"
" \\ / \\ /\n"
@@ -70132,7 +60033,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:244
-#, no-wrap
+#, no-wrap, priority:100
msgid ""
" A = = A^0\n"
" B = A^ = A^1 = A~1\n"
@@ -70148,246 +60049,211 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:251
-msgid ""
-"History traversing commands such as `git log` operate on a set of commits, "
-"not just a single commit."
+#, priority:100
+msgid "History traversing commands such as `git log` operate on a set of commits, not just a single commit."
msgstr ""
#. type: Plain text
#: en/revisions.txt:256
-msgid ""
-"For these commands, specifying a single revision, using the notation "
-"described in the previous section, means the set of commits `reachable` from "
-"the given commit."
+#, priority:100
+msgid "For these commands, specifying a single revision, using the notation described in the previous section, means the set of commits `reachable` from the given commit."
msgstr ""
#. type: Plain text
#: en/revisions.txt:259
-msgid ""
-"A commit's reachable set is the commit itself and the commits in its "
-"ancestry chain."
+#, priority:100
+msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
msgstr ""
#. type: Title ~
#: en/revisions.txt:262
-#, no-wrap
+#, no-wrap, priority:100
msgid "Commit Exclusions"
msgstr ""
#. type: Labeled list
#: en/revisions.txt:264
-#, no-wrap
+#, no-wrap, priority:100
msgid "'{caret}<rev>' (caret) Notation"
msgstr ""
#. type: Plain text
#: en/revisions.txt:269
-msgid ""
-"To exclude commits reachable from a commit, a prefix '{caret}' notation is "
-"used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the "
-"ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
+#, priority:100
+msgid "To exclude commits reachable from a commit, a prefix '{caret}' notation is used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
msgstr ""
#. type: Title ~
#: en/revisions.txt:271
-#, no-wrap
+#, no-wrap, priority:100
msgid "Dotted Range Notations"
msgstr ""
#. type: Labeled list
#: en/revisions.txt:273
-#, no-wrap
+#, no-wrap, priority:100
msgid "The '..' (two-dot) Range Notation"
msgstr ""
#. type: Plain text
#: en/revisions.txt:279
-msgid ""
-"The '{caret}r1 r2' set operation appears so often that there is a shorthand "
-"for it. When you have two commits 'r1' and 'r2' (named according to the "
-"syntax explained in SPECIFYING REVISIONS above), you can ask for commits "
-"that are reachable from r2 excluding those that are reachable from r1 by "
-"'{caret}r1 r2' and it can be written as 'r1..r2'."
+#, priority:100
+msgid "The '{caret}r1 r2' set operation appears so often that there is a shorthand for it. When you have two commits 'r1' and 'r2' (named according to the syntax explained in SPECIFYING REVISIONS above), you can ask for commits that are reachable from r2 excluding those that are reachable from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:280
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "The '...' (three-dot) Symmetric Difference Notation"
msgstr ""
#. type: Plain text
#: en/revisions.txt:286
-msgid ""
-"A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and "
-"'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is "
-"the set of commits that are reachable from either one of 'r1' (left side) or "
-"'r2' (right side) but not from both."
+#, ignore-ellipsis, priority:100
+msgid "A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and 'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is the set of commits that are reachable from either one of 'r1' (left side) or 'r2' (right side) but not from both."
msgstr ""
#. type: Plain text
#: en/revisions.txt:293
-msgid ""
-"In these two shorthand notations, you can omit one end and let it default to "
-"HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "
-"\"What did I do since I forked from the origin branch?\" Similarly, "
-"'..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin "
-"do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which "
-"is an empty range that is both reachable and unreachable from HEAD."
+#, priority:100
+msgid "In these two shorthand notations, you can omit one end and let it default to HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks \"What did I do since I forked from the origin branch?\" Similarly, '..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which is an empty range that is both reachable and unreachable from HEAD."
msgstr ""
#. type: Title ~
#: en/revisions.txt:295
-#, no-wrap
+#, no-wrap, priority:100
msgid "Other <rev>{caret} Parent Shorthand Notations"
msgstr ""
#. type: Plain text
#: en/revisions.txt:298
-msgid ""
-"Three other shorthands exist, particularly useful for merge commits, for "
-"naming a set that is formed by a commit and its parent commits."
+#, priority:100
+msgid "Three other shorthands exist, particularly useful for merge commits, for naming a set that is formed by a commit and its parent commits."
msgstr ""
#. type: Plain text
#: en/revisions.txt:300
+#, priority:100
msgid "The 'r1{caret}@' notation means all parents of 'r1'."
msgstr ""
#. type: Plain text
#: en/revisions.txt:303
-msgid ""
-"The 'r1{caret}!' notation includes commit 'r1' but excludes all of its "
-"parents. By itself, this notation denotes the single commit 'r1'."
+#, priority:100
+msgid "The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents. By itself, this notation denotes the single commit 'r1'."
msgstr ""
#. type: Plain text
#: en/revisions.txt:310
-msgid ""
-"The '<rev>{caret}-[<n>]' notation includes '<rev>' but excludes the <n>th "
-"parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if "
-"not given. This is typically useful for merge commits where you can just "
-"pass '<commit>{caret}-' to get all the commits in the branch that was merged "
-"in merge commit '<commit>' (including '<commit>' itself)."
+#, priority:100
+msgid "The '<rev>{caret}-[<n>]' notation includes '<rev>' but excludes the <n>th parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if not given. This is typically useful for merge commits where you can just pass '<commit>{caret}-' to get all the commits in the branch that was merged in merge commit '<commit>' (including '<commit>' itself)."
msgstr ""
#. type: Plain text
#: en/revisions.txt:314
-msgid ""
-"While '<rev>{caret}<n>' was about specifying a single commit parent, these "
-"three notations also consider its parents. For example you can say "
-"'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'."
+#, priority:100
+msgid "While '<rev>{caret}<n>' was about specifying a single commit parent, these three notations also consider its parents. For example you can say 'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'."
msgstr ""
#. type: Title -
#: en/revisions.txt:316
-#, no-wrap
+#, no-wrap, priority:100
msgid "Revision Range Summary"
msgstr ""
#. type: Labeled list
#: en/revisions.txt:318
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:321
-msgid ""
-"Include commits that are reachable from <rev> (i.e. <rev> and its "
-"ancestors)."
+#, priority:100
+msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:322
-#, no-wrap
+#, no-wrap, priority:100
msgid "'{caret}<rev>'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:325
-msgid ""
-"Exclude commits that are reachable from <rev> (i.e. <rev> and its "
-"ancestors)."
+#, priority:100
+msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:326
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev1>..<rev2>'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:330
-msgid ""
-"Include commits that are reachable from <rev2> but exclude those that are "
-"reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults "
-"to `HEAD`."
+#, priority:100
+msgid "Include commits that are reachable from <rev2> but exclude those that are reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:331
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'<rev1>\\...<rev2>'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:335
-msgid ""
-"Include commits that are reachable from either <rev1> or <rev2> but exclude "
-"those that are reachable from both. When either <rev1> or <rev2> is "
-"omitted, it defaults to `HEAD`."
+#, priority:100
+msgid "Include commits that are reachable from either <rev1> or <rev2> but exclude those that are reachable from both. When either <rev1> or <rev2> is omitted, it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:336
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:340
-msgid ""
-"A suffix '{caret}' followed by an at sign is the same as listing all parents "
-"of '<rev>' (meaning, include anything reachable from its parents, but not "
-"the commit itself)."
+#, priority:100
+msgid "A suffix '{caret}' followed by an at sign is the same as listing all parents of '<rev>' (meaning, include anything reachable from its parents, but not the commit itself)."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:341
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:345
-msgid ""
-"A suffix '{caret}' followed by an exclamation mark is the same as giving "
-"commit '<rev>' and then all its parents prefixed with '{caret}' to exclude "
-"them (and their ancestors)."
+#, priority:100
+msgid "A suffix '{caret}' followed by an exclamation mark is the same as giving commit '<rev>' and then all its parents prefixed with '{caret}' to exclude them (and their ancestors)."
msgstr ""
#. type: Labeled list
#: en/revisions.txt:346
-#, no-wrap
+#, no-wrap, priority:100
msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:349
+#, priority:100
msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
msgstr ""
#. type: Plain text
#: en/revisions.txt:353
-msgid ""
-"Here are a handful of examples using the Loeliger illustration above, with "
-"each step in the notation's expansion and selection carefully spelt out:"
+#, priority:100
+msgid "Here are a handful of examples using the Loeliger illustration above, with each step in the notation's expansion and selection carefully spelt out:"
msgstr ""
#. type: delimited block .
#: en/revisions.txt:377
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" Args Expanded arguments Selected commits\n"
" D G H D\n"
@@ -70415,831 +60281,721 @@ msgstr ""
#. type: Title ~
#: en/rev-list-options.txt:2
-#, no-wrap
+#, no-wrap, priority:260
msgid "Commit Limiting"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:7
-msgid ""
-"Besides specifying a range of commits that should be listed using the "
-"special notations explained in the description, additional commit limiting "
-"may be applied."
+#, priority:260
+msgid "Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit limiting may be applied."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:12
-msgid ""
-"Using more options generally further limits the output (e.g. "
-"`--since=<date1>` limits to commits newer than `<date1>`, and using it with "
-"`--grep=<pattern>` further limits to commits whose log message has a line "
-"that matches `<pattern>`), unless otherwise noted."
+#, priority:260
+msgid "Using more options generally further limits the output (e.g. `--since=<date1>` limits to commits newer than `<date1>`, and using it with `--grep=<pattern>` further limits to commits whose log message has a line that matches `<pattern>`), unless otherwise noted."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:15
-msgid ""
-"Note that these are applied before commit ordering and formatting options, "
-"such as `--reverse`."
+#, priority:260
+msgid "Note that these are applied before commit ordering and formatting options, such as `--reverse`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:16
-#, no-wrap
+#, no-wrap, priority:260
msgid "-<number>"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:17
-#, no-wrap
+#, no-wrap, priority:260
msgid "-n <number>"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:18
-#, no-wrap
+#, no-wrap, priority:260
msgid "--max-count=<number>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:20
+#, priority:260
msgid "Limit the number of commits to output."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:21
-#, no-wrap
+#, no-wrap, priority:260
msgid "--skip=<number>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:23
+#, priority:260
msgid "Skip 'number' commits before starting to show the commit output."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:24
-#, no-wrap
+#, no-wrap, priority:260
msgid "--since=<date>"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:25
-#, no-wrap
+#, no-wrap, priority:260
msgid "--after=<date>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:27
+#, priority:260
msgid "Show commits more recent than a specific date."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:28
-#, no-wrap
+#, no-wrap, priority:260
msgid "--until=<date>"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:29
-#, no-wrap
+#, no-wrap, priority:260
msgid "--before=<date>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:31
+#, priority:260
msgid "Show commits older than a specific date."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:33
-#, no-wrap
+#, no-wrap, priority:260
msgid "--max-age=<timestamp>"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:34
-#, no-wrap
+#, no-wrap, priority:260
msgid "--min-age=<timestamp>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:36
+#, priority:260
msgid "Limit the commits output to specified time range."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:38
-#, no-wrap
+#, no-wrap, priority:260
msgid "--author=<pattern>"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:39
-#, no-wrap
+#, no-wrap, priority:260
msgid "--committer=<pattern>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:45
-msgid ""
-"Limit the commits output to ones with author/committer header lines that "
-"match the specified pattern (regular expression). With more than one "
-"`--author=<pattern>`, commits whose author matches any of the given patterns "
-"are chosen (similarly for multiple `--committer=<pattern>`)."
+#, priority:260
+msgid "Limit the commits output to ones with author/committer header lines that match the specified pattern (regular expression). With more than one `--author=<pattern>`, commits whose author matches any of the given patterns are chosen (similarly for multiple `--committer=<pattern>`)."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:46
-#, no-wrap
+#, no-wrap, priority:260
msgid "--grep-reflog=<pattern>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:52
-msgid ""
-"Limit the commits output to ones with reflog entries that match the "
-"specified pattern (regular expression). With more than one `--grep-reflog`, "
-"commits whose reflog message matches any of the given patterns are chosen. "
-"It is an error to use this option unless `--walk-reflogs` is in use."
+#, priority:260
+msgid "Limit the commits output to ones with reflog entries that match the specified pattern (regular expression). With more than one `--grep-reflog`, commits whose reflog message matches any of the given patterns are chosen. It is an error to use this option unless `--walk-reflogs` is in use."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:53
-#, no-wrap
+#, no-wrap, priority:260
msgid "--grep=<pattern>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:59
-msgid ""
-"Limit the commits output to ones with log message that matches the specified "
-"pattern (regular expression). With more than one `--grep=<pattern>`, "
-"commits whose message matches any of the given patterns are chosen (but see "
-"`--all-match`)."
+#, priority:260
+msgid "Limit the commits output to ones with log message that matches the specified pattern (regular expression). With more than one `--grep=<pattern>`, commits whose message matches any of the given patterns are chosen (but see `--all-match`)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:63
-msgid ""
-"When `--notes` is in effect, the message from the notes is matched as if it "
-"were part of the log message."
+#, priority:260
+msgid "When `--notes` is in effect, the message from the notes is matched as if it were part of the log message."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:68
-msgid ""
-"Limit the commits output to ones that match all given `--grep`, instead of "
-"ones that match at least one."
+#, priority:260
+msgid "Limit the commits output to ones that match all given `--grep`, instead of ones that match at least one."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:69
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--invert-grep"
msgstr "--invert-grep"
#. type: Plain text
#: en/rev-list-options.txt:72
-msgid ""
-"Limit the commits output to ones with log message that do not match the "
-"pattern specified with `--grep=<pattern>`."
+#, priority:260
+msgid "Limit the commits output to ones with log message that do not match the pattern specified with `--grep=<pattern>`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:74
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--regexp-ignore-case"
msgstr "--regexp-ignore-case"
#. type: Plain text
#: en/rev-list-options.txt:77
-msgid ""
-"Match the regular expression limiting patterns without regard to letter "
-"case."
+#, priority:260
+msgid "Match the regular expression limiting patterns without regard to letter case."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:81
-msgid ""
-"Consider the limiting patterns to be basic regular expressions; this is the "
-"default."
+#, priority:260
+msgid "Consider the limiting patterns to be basic regular expressions; this is the default."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:86
-msgid ""
-"Consider the limiting patterns to be extended regular expressions instead of "
-"the default basic regular expressions."
+#, priority:260
+msgid "Consider the limiting patterns to be extended regular expressions instead of the default basic regular expressions."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:91
-msgid ""
-"Consider the limiting patterns to be fixed strings (don't interpret pattern "
-"as a regular expression)."
+#, priority:260
+msgid "Consider the limiting patterns to be fixed strings (don't interpret pattern as a regular expression)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:96
+#, priority:260
msgid "Consider the limiting patterns to be Perl-compatible regular expressions."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--remove-empty"
msgstr "--remove-empty"
#. type: Plain text
#: en/rev-list-options.txt:103
+#, priority:260
msgid "Stop when a given path disappears from the tree."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--merges"
msgstr "--merges"
#. type: Plain text
#: en/rev-list-options.txt:106
+#, priority:260
msgid "Print only merge commits. This is exactly the same as `--min-parents=2`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:107
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-merges"
msgstr "--no-merges"
#. type: Plain text
#: en/rev-list-options.txt:110
-msgid ""
-"Do not print commits with more than one parent. This is exactly the same as "
-"`--max-parents=1`."
+#, priority:260
+msgid "Do not print commits with more than one parent. This is exactly the same as `--max-parents=1`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:111
-#, no-wrap
+#, no-wrap, priority:260
msgid "--min-parents=<number>"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:112
-#, no-wrap
+#, no-wrap, priority:260
msgid "--max-parents=<number>"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:113
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-min-parents"
msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:114
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-max-parents"
msgstr "--no-max-parents"
#. type: Plain text
#: en/rev-list-options.txt:119
-msgid ""
-"Show only commits which have at least (or at most) that many parent "
-"commits. In particular, `--max-parents=1` is the same as `--no-merges`, "
-"`--min-parents=2` is the same as `--merges`. `--max-parents=0` gives all "
-"root commits and `--min-parents=3` all octopus merges."
+#, priority:260
+msgid "Show only commits which have at least (or at most) that many parent commits. In particular, `--max-parents=1` is the same as `--no-merges`, `--min-parents=2` is the same as `--merges`. `--max-parents=0` gives all root commits and `--min-parents=3` all octopus merges."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:123
-msgid ""
-"`--no-min-parents` and `--no-max-parents` reset these limits (to no limit) "
-"again. Equivalent forms are `--min-parents=0` (any commit has 0 or more "
-"parents) and `--max-parents=-1` (negative numbers denote no upper limit)."
+#, priority:260
+msgid "`--no-min-parents` and `--no-max-parents` reset these limits (to no limit) again. Equivalent forms are `--min-parents=0` (any commit has 0 or more parents) and `--max-parents=-1` (negative numbers denote no upper limit)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:133
-msgid ""
-"Follow only the first parent commit upon seeing a merge commit. This option "
-"can give a better overview when viewing the evolution of a particular topic "
-"branch, because merges into a topic branch tend to be only about adjusting "
-"to updated upstream from time to time, and this option allows you to ignore "
-"the individual commits brought in to your history by such a merge. Cannot be "
-"combined with --bisect."
+#, priority:260
+msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge. Cannot be combined with --bisect."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:137
-msgid ""
-"Reverses the meaning of the '{caret}' prefix (or lack thereof) for all "
-"following revision specifiers, up to the next `--not`."
+#, priority:260
+msgid "Reverses the meaning of the '{caret}' prefix (or lack thereof) for all following revision specifiers, up to the next `--not`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:141
-msgid ""
-"Pretend as if all the refs in `refs/`, along with `HEAD`, are listed on the "
-"command line as '<commit>'."
+#, priority:260
+msgid "Pretend as if all the refs in `refs/`, along with `HEAD`, are listed on the command line as '<commit>'."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:142
-#, no-wrap
+#, no-wrap, priority:260
msgid "--branches[=<pattern>]"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:147
-msgid ""
-"Pretend as if all the refs in `refs/heads` are listed on the command line as "
-"'<commit>'. If '<pattern>' is given, limit branches to ones matching given "
-"shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the "
-"end is implied."
+#, priority:260
+msgid "Pretend as if all the refs in `refs/heads` are listed on the command line as '<commit>'. If '<pattern>' is given, limit branches to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:148
-#, no-wrap
+#, no-wrap, priority:260
msgid "--tags[=<pattern>]"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:153
-msgid ""
-"Pretend as if all the refs in `refs/tags` are listed on the command line as "
-"'<commit>'. If '<pattern>' is given, limit tags to ones matching given shell "
-"glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end "
-"is implied."
+#, priority:260
+msgid "Pretend as if all the refs in `refs/tags` are listed on the command line as '<commit>'. If '<pattern>' is given, limit tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:154
-#, no-wrap
+#, no-wrap, priority:260
msgid "--remotes[=<pattern>]"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:159
-msgid ""
-"Pretend as if all the refs in `refs/remotes` are listed on the command line "
-"as '<commit>'. If '<pattern>' is given, limit remote-tracking branches to "
-"ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', "
-"'/{asterisk}' at the end is implied."
+#, priority:260
+msgid "Pretend as if all the refs in `refs/remotes` are listed on the command line as '<commit>'. If '<pattern>' is given, limit remote-tracking branches to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:160
-#, no-wrap
+#, no-wrap, priority:260
msgid "--glob=<glob-pattern>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:165
-msgid ""
-"Pretend as if all the refs matching shell glob '<glob-pattern>' are listed "
-"on the command line as '<commit>'. Leading 'refs/', is automatically "
-"prepended if missing. If pattern lacks '?', '{asterisk}', or '[', "
-"'/{asterisk}' at the end is implied."
+#, priority:260
+msgid "Pretend as if all the refs matching shell glob '<glob-pattern>' are listed on the command line as '<commit>'. Leading 'refs/', is automatically prepended if missing. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:181
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--reflog"
msgstr "--reflog"
#. type: Plain text
#: en/rev-list-options.txt:184
-msgid ""
-"Pretend as if all objects mentioned by reflogs are listed on the command "
-"line as `<commit>`."
+#, priority:260
+msgid "Pretend as if all objects mentioned by reflogs are listed on the command line as `<commit>`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:185
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--alternate-refs"
msgstr "--alternate-refs"
#. type: Plain text
#: en/rev-list-options.txt:192
-msgid ""
-"Pretend as if all objects mentioned as ref tips of alternate repositories "
-"were listed on the command line. An alternate repository is any repository "
-"whose object directory is specified in `objects/info/alternates`. The set "
-"of included objects may be modified by `core.alternateRefsCommand`, etc. See "
-"linkgit:git-config[1]."
+#, priority:260
+msgid "Pretend as if all objects mentioned as ref tips of alternate repositories were listed on the command line. An alternate repository is any repository whose object directory is specified in `objects/info/alternates`. The set of included objects may be modified by `core.alternateRefsCommand`, etc. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:200
-msgid ""
-"By default, all working trees will be examined by the following options when "
-"there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` "
-"and `--indexed-objects`. This option forces them to examine the current "
-"working tree only."
+#, priority:260
+msgid "By default, all working trees will be examined by the following options when there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` and `--indexed-objects`. This option forces them to examine the current working tree only."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:204
-msgid ""
-"Upon seeing an invalid object name in the input, pretend as if the bad input "
-"was not given."
+#, priority:260
+msgid "Upon seeing an invalid object name in the input, pretend as if the bad input was not given."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:206 en/rev-list-options.txt:589
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
#. type: Plain text
#: en/rev-list-options.txt:211
-msgid ""
-"Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if "
-"it was followed by `--not` and the good bisection refs `refs/bisect/good-*` "
-"on the command line. Cannot be combined with --first-parent."
+#, priority:260
+msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line. Cannot be combined with --first-parent."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:218
-msgid ""
-"In addition to the '<commit>' listed on the command line, read them from the "
-"standard input. If a `--` separator is seen, stop reading commits and start "
-"reading paths to limit the result."
+#, priority:260
+msgid "In addition to the '<commit>' listed on the command line, read them from the standard input. If a `--` separator is seen, stop reading commits and start reading paths to limit the result."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:226
-msgid ""
-"Don't print anything to standard output. This form is primarily meant to "
-"allow the caller to test the exit status to see if a range of objects is "
-"fully connected (or not). It is faster than redirecting stdout to "
-"`/dev/null` as the output does not have to be formatted."
+#, priority:260
+msgid "Don't print anything to standard output. This form is primarily meant to allow the caller to test the exit status to see if a range of objects is fully connected (or not). It is faster than redirecting stdout to `/dev/null` as the output does not have to be formatted."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:228
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--cherry-mark"
msgstr "--cherry-mark"
#. type: Plain text
#: en/rev-list-options.txt:231
-msgid ""
-"Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather "
-"than omitting them, and inequivalent ones with `+`."
+#, priority:260
+msgid "Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather than omitting them, and inequivalent ones with `+`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:232
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--cherry-pick"
msgstr "--cherry-pick"
#. type: Plain text
#: en/rev-list-options.txt:236
-msgid ""
-"Omit any commit that introduces the same change as another commit on the "
-"``other side'' when the set of commits are limited with symmetric "
-"difference."
+#, priority:260
+msgid "Omit any commit that introduces the same change as another commit on the ``other side'' when the set of commits are limited with symmetric difference."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:244
-msgid ""
-"For example, if you have two branches, `A` and `B`, a usual way to list all "
-"commits on only one side of them is with `--left-right` (see the example "
-"below in the description of the `--left-right` option). However, it shows "
-"the commits that were cherry-picked from the other branch (for example, "
-"``3rd on b'' may be cherry-picked from branch A). With this option, such "
-"pairs of commits are excluded from the output."
+#, priority:260
+msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:245
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:246
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--right-only"
msgstr "--right-only"
#. type: Plain text
#: en/rev-list-options.txt:250
-msgid ""
-"List only commits on the respective side of a symmetric difference, "
-"i.e. only those which would be marked `<` resp. `>` by `--left-right`."
+#, priority:260
+msgid "List only commits on the respective side of a symmetric difference, i.e. only those which would be marked `<` resp. `>` by `--left-right`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:256
-msgid ""
-"For example, `--cherry-pick --right-only A...B` omits those commits from `B` "
-"which are in `A` or are patch-equivalent to a commit in `A`. In other words, "
-"this lists the `+` commits from `git cherry A B`. More precisely, "
-"`--cherry-pick --right-only --no-merges` gives the exact list."
+#, ignore-ellipsis, priority:260
+msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:257
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--cherry"
msgstr "--cherry"
#. type: Plain text
#: en/rev-list-options.txt:263
-msgid ""
-"A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the "
-"output to the commits on our side and mark those that have been applied to "
-"the other side of a forked history with `git log --cherry "
-"upstream...mybranch`, similar to `git cherry upstream mybranch`."
+#, ignore-ellipsis, priority:260
+msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:265
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
#. type: Plain text
#: en/rev-list-options.txt:271
-msgid ""
-"Instead of walking the commit ancestry chain, walk reflog entries from the "
-"most recent one to older ones. When this option is used you cannot specify "
-"commits to exclude (that is, '{caret}commit', 'commit1..commit2', and "
-"'commit1\\...commit2' notations cannot be used)."
+#, ignore-ellipsis, priority:260
+msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:278
-msgid ""
-"With `--pretty` format other than `oneline` and `reference` (for obvious "
-"reasons), this causes the output to have two extra lines of information "
-"taken from the reflog. The reflog designator in the output may be shown as "
-"`ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) "
-"or as `ref@{timestamp}` (with the timestamp for that entry), depending on a "
-"few rules:"
+#, priority:260
+msgid "With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:282
+#, priority:260
msgid "If the starting point is specified as `ref@{Nth}`, show the index format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:285
-msgid ""
-"If the starting point was specified as `ref@{now}`, show the timestamp "
-"format."
+#, priority:260
+msgid "If the starting point was specified as `ref@{now}`, show the timestamp format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:288
-msgid ""
-"If neither was used, but `--date` was given on the command line, show the "
-"timestamp in the format requested by `--date`."
+#, priority:260
+msgid "If neither was used, but `--date` was given on the command line, show the timestamp in the format requested by `--date`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:290
+#, priority:260
msgid "Otherwise, show the index format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:296
-msgid ""
-"Under `--pretty=oneline`, the commit message is prefixed with this "
-"information on the same line. This option cannot be combined with "
-"`--reverse`. See also linkgit:git-reflog[1]."
+#, priority:260
+msgid "Under `--pretty=oneline`, the commit message is prefixed with this information on the same line. This option cannot be combined with `--reverse`. See also linkgit:git-reflog[1]."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:298
+#, priority:260
msgid "Under `--pretty=reference`, this information will not be shown at all."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:302
-msgid ""
-"After a failed merge, show refs that touch files having a conflict and don't "
-"exist on all heads to merge."
+#, priority:260
+msgid "After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:303
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--boundary"
msgstr "--boundary"
#. type: Plain text
#: en/rev-list-options.txt:306
+#, priority:260
msgid "Output excluded boundary commits. Boundary commits are prefixed with `-`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:308
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
#. type: Plain text
#: en/rev-list-options.txt:313
-msgid ""
-"Try to speed up the traversal using the pack bitmap index (if one is "
-"available). Note that when traversing with `--objects`, trees and blobs will "
-"not have their associated path printed."
+#, priority:260
+msgid "Try to speed up the traversal using the pack bitmap index (if one is available). Note that when traversing with `--objects`, trees and blobs will not have their associated path printed."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:314
-#, no-wrap
+#, no-wrap, priority:260
msgid "--progress=<header>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:317
-msgid ""
-"Show progress reports on stderr as objects are considered. The `<header>` "
-"text will be printed with each progress update."
+#, priority:260
+msgid "Show progress reports on stderr as objects are considered. The `<header>` text will be printed with each progress update."
msgstr ""
#. type: Title ~
#: en/rev-list-options.txt:320
-#, no-wrap
+#, no-wrap, priority:260
msgid "History Simplification"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:326
-msgid ""
-"Sometimes you are only interested in parts of the history, for example the "
-"commits modifying a particular <path>. But there are two parts of 'History "
-"Simplification', one part is selecting the commits and the other is how to "
-"do it, as there are various strategies to simplify the history."
+#, priority:260
+msgid "Sometimes you are only interested in parts of the history, for example the commits modifying a particular <path>. But there are two parts of 'History Simplification', one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:328
+#, priority:260
msgid "The following options select the commits to be shown:"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:329
-#, no-wrap
+#, no-wrap, priority:260
msgid "<paths>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:331
+#, priority:260
msgid "Commits modifying the given <paths> are selected."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:332
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
#. type: Plain text
#: en/rev-list-options.txt:334
+#, priority:260
msgid "Commits that are referred by some branch or tag are selected."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:336
+#, priority:260
msgid "Note that extra commits can be shown to give a meaningful history."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:338
+#, priority:260
msgid "The following options affect the way the simplification is performed:"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:339 en/rev-list-options.txt:413
-#, no-wrap
+#, no-wrap, priority:260
msgid "Default mode"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:344
-msgid ""
-"Simplifies the history to the simplest history explaining the final state of "
-"the tree. Simplest because it prunes some side branches if the end result is "
-"the same (i.e. merging branches with the same content)"
+#, priority:260
+msgid "Simplifies the history to the simplest history explaining the final state of the tree. Simplest because it prunes some side branches if the end result is the same (i.e. merging branches with the same content)"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:345
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--full-history"
msgstr "--full-history"
#. type: Plain text
#: en/rev-list-options.txt:347
+#, priority:260
msgid "Same as the default mode, but does not prune some history."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:348 en/rev-list-options.txt:481
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--dense"
msgstr "--dense"
#. type: Plain text
#: en/rev-list-options.txt:351
+#, priority:260
msgid "Only the selected commits are shown, plus some to have a meaningful history."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:354
+#, priority:260
msgid "All commits in the simplified history are shown."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:355 en/rev-list-options.txt:492
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--simplify-merges"
msgstr "--simplify-merges"
#. type: Plain text
#: en/rev-list-options.txt:359
-msgid ""
-"Additional option to `--full-history` to remove some needless merges from "
-"the resulting history, as there are no selected commits contributing to this "
-"merge."
+#, priority:260
+msgid "Additional option to `--full-history` to remove some needless merges from the resulting history, as there are no selected commits contributing to this merge."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:360 en/rev-list-options.txt:539
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--ancestry-path"
msgstr "--ancestry-path"
#. type: Plain text
#: en/rev-list-options.txt:366
-msgid ""
-"When given a range of commits to display (e.g. 'commit1..commit2' or "
-"'commit2 {caret}commit1'), only display commits that exist directly on the "
-"ancestry chain between the 'commit1' and 'commit2', i.e. commits that are "
-"both descendants of 'commit1', and ancestors of 'commit2'."
+#, priority:260
+msgid "When given a range of commits to display (e.g. 'commit1..commit2' or 'commit2 {caret}commit1'), only display commits that exist directly on the ancestry chain between the 'commit1' and 'commit2', i.e. commits that are both descendants of 'commit1', and ancestors of 'commit2'."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:368
+#, priority:260
msgid "A more detailed explanation follows."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:372
-msgid ""
-"Suppose you specified `foo` as the <paths>. We shall call commits that "
-"modify `foo` !TREESAME, and the rest TREESAME. (In a diff filtered for "
-"`foo`, they look different and equal, respectively.)"
+#, priority:260
+msgid "Suppose you specified `foo` as the <paths>. We shall call commits that modify `foo` !TREESAME, and the rest TREESAME. (In a diff filtered for `foo`, they look different and equal, respectively.)"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:376
-msgid ""
-"In the following, we will always refer to the same example history to "
-"illustrate the differences between simplification settings. We assume that "
-"you are filtering for a file `foo` in this commit graph:"
+#, priority:260
+msgid "In the following, we will always refer to the same example history to illustrate the differences between simplification settings. We assume that you are filtering for a file `foo` in this commit graph:"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:382
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O---P---Q\n"
"\t / / / / / /\n"
@@ -71250,85 +61006,73 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:385
-msgid ""
-"The horizontal line of history A---Q is taken to be the first parent of each "
-"merge. The commits are:"
+#, priority:260
+msgid "The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:389
-msgid ""
-"`I` is the initial commit, in which `foo` exists with contents ``asdf'', and "
-"a file `quux` exists with contents ``quux''. Initial commits are compared to "
-"an empty tree, so `I` is !TREESAME."
+#, priority:260
+msgid "`I` is the initial commit, in which `foo` exists with contents ``asdf'', and a file `quux` exists with contents ``quux''. Initial commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:391
+#, priority:260
msgid "In `A`, `foo` contains just ``foo''."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:394
-msgid ""
-"`B` contains the same change as `A`. Its merge `M` is trivial and hence "
-"TREESAME to all parents."
+#, priority:260
+msgid "`B` contains the same change as `A`. Its merge `M` is trivial and hence TREESAME to all parents."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:397
-msgid ""
-"`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it "
-"is not TREESAME to any parent."
+#, priority:260
+msgid "`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:400
-msgid ""
-"`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and "
-"`D` to ``foobarbaz''; i.e., it is not TREESAME to any parent."
+#, priority:260
+msgid "`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:403
-msgid ""
-"`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to "
-"``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`."
+#, priority:260
+msgid "`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:407
-msgid ""
-"`X` is an independent root commit that added a new file `side`, and `Y` "
-"modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and "
-"`Q` is TREESAME to `P`, but not to `Y`."
+#, priority:260
+msgid "`X` is an independent root commit that added a new file `side`, and `Y` modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and `Q` is TREESAME to `P`, but not to `Y`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:412
-msgid ""
-"`rev-list` walks backwards through history, including or excluding commits "
-"based on whether `--full-history` and/or parent rewriting (via `--parents` "
-"or `--children`) are used. The following settings are available."
+#, priority:260
+msgid "`rev-list` walks backwards through history, including or excluding commits based on whether `--full-history` and/or parent rewriting (via `--parents` or `--children`) are used. The following settings are available."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:420
-msgid ""
-"Commits are included if they are not TREESAME to any parent (though this can "
-"be changed, see `--sparse` below). If the commit was a merge, and it was "
-"TREESAME to one parent, follow only that parent. (Even if there are several "
-"TREESAME parents, follow only one of them.) Otherwise, follow all parents."
+#, priority:260
+msgid "Commits are included if they are not TREESAME to any parent (though this can be changed, see `--sparse` below). If the commit was a merge, and it was TREESAME to one parent, follow only that parent. (Even if there are several TREESAME parents, follow only one of them.) Otherwise, follow all parents."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:422
+#, priority:260
msgid "This results in:"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:427
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t .-A---N---O\n"
"\t / / /\n"
@@ -71337,80 +61081,67 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:433
-msgid ""
-"Note how the rule to only follow the TREESAME parent, if one is available, "
-"removed `B` from consideration entirely. `C` was considered via `N`, but is "
-"TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
+#, priority:260
+msgid "Note how the rule to only follow the TREESAME parent, if one is available, removed `B` from consideration entirely. `C` was considered via `N`, but is TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:437
-msgid ""
-"Parent/child relations are only visible with `--parents`, but that does not "
-"affect the commits selected in default mode, so we have shown the parent "
-"lines."
+#, priority:260
+msgid "Parent/child relations are only visible with `--parents`, but that does not affect the commits selected in default mode, so we have shown the parent lines."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:438
-#, no-wrap
+#, no-wrap, priority:260
msgid "--full-history without parent rewriting"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:444
-msgid ""
-"This mode differs from the default in one point: always follow all parents "
-"of a merge, even if it is TREESAME to one of them. Even if more than one "
-"side of the merge has commits that are included, this does not imply that "
-"the merge itself is! In the example, we get"
+#, priority:260
+msgid "This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:447
-#, no-wrap
+#, no-wrap, priority:260
msgid "\tI A B N D O P Q\n"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:452
-msgid ""
-"`M` was excluded because it is TREESAME to both parents. `E`, `C` and `B` "
-"were all walked, but only `B` was !TREESAME, so the others do not appear."
+#, priority:260
+msgid "`M` was excluded because it is TREESAME to both parents. `E`, `C` and `B` were all walked, but only `B` was !TREESAME, so the others do not appear."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:456
-msgid ""
-"Note that without parent rewriting, it is not really possible to talk about "
-"the parent/child relationships between the commits, so we show them "
-"disconnected."
+#, priority:260
+msgid "Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:457
-#, no-wrap
+#, no-wrap, priority:260
msgid "--full-history with parent rewriting"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:460
-msgid ""
-"Ordinary commits are only included if they are !TREESAME (though this can be "
-"changed, see `--sparse` below)."
+#, priority:260
+msgid "Ordinary commits are only included if they are !TREESAME (though this can be changed, see `--sparse` below)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:464
-msgid ""
-"Merges are always included. However, their parent list is rewritten: Along "
-"each parent, prune away commits that are not included themselves. This "
-"results in"
+#, priority:260
+msgid "Merges are always included. However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves. This results in"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:471
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O---P---Q\n"
"\t / / / / /\n"
@@ -71421,84 +61152,73 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:477
-msgid ""
-"Compare to `--full-history` without rewriting above. Note that `E` was "
-"pruned away because it is TREESAME, but the parent list of P was rewritten "
-"to contain `E`'s parent `I`. The same happened for `C` and `N`, and `X`, "
-"`Y` and `Q`."
+#, priority:260
+msgid "Compare to `--full-history` without rewriting above. Note that `E` was pruned away because it is TREESAME, but the parent list of P was rewritten to contain `E`'s parent `I`. The same happened for `C` and `N`, and `X`, `Y` and `Q`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:480
-msgid ""
-"In addition to the above settings, you can change whether TREESAME affects "
-"inclusion:"
+#, priority:260
+msgid "In addition to the above settings, you can change whether TREESAME affects inclusion:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:484
+#, priority:260
msgid "Commits that are walked are included if they are not TREESAME to any parent."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:487
+#, priority:260
msgid "All commits that are walked are included."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:491
-msgid ""
-"Note that without `--full-history`, this still simplifies merges: if one of "
-"the parents is TREESAME, we follow only that one, so the other sides of the "
-"merge are never walked."
+#, priority:260
+msgid "Note that without `--full-history`, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:495
-msgid ""
-"First, build a history graph in the same way that `--full-history` with "
-"parent rewriting does (see above)."
+#, priority:260
+msgid "First, build a history graph in the same way that `--full-history` with parent rewriting does (see above)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:498
-msgid ""
-"Then simplify each commit `C` to its replacement `C'` in the final history "
-"according to the following rules:"
+#, priority:260
+msgid "Then simplify each commit `C` to its replacement `C'` in the final history according to the following rules:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:501
+#, priority:260
msgid "Set `C'` to `C`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:506
-msgid ""
-"Replace each parent `P` of `C'` with its simplification `P'`. In the "
-"process, drop parents that are ancestors of other parents or that are root "
-"commits TREESAME to an empty tree, and remove duplicates, but take care to "
-"never drop all parents that we are TREESAME to."
+#, priority:260
+msgid "Replace each parent `P` of `C'` with its simplification `P'`. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:510
-msgid ""
-"If after this parent rewriting, `C'` is a root or merge commit (has zero or "
-">1 parents), a boundary commit, or !TREESAME, it remains. Otherwise, it is "
-"replaced with its only parent."
+#, priority:260
+msgid "If after this parent rewriting, `C'` is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains. Otherwise, it is replaced with its only parent."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:514
-msgid ""
-"The effect of this is best shown by way of comparing to `--full-history` "
-"with parent rewriting. The example turns into:"
+#, priority:260
+msgid "The effect of this is best shown by way of comparing to `--full-history` with parent rewriting. The example turns into:"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:521
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O\n"
"\t / / /\n"
@@ -71509,53 +61229,49 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:524
+#, priority:260
msgid "Note the major differences in `N`, `P`, and `Q` over `--full-history`:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:528
-msgid ""
-"`N`'s parent list had `I` removed, because it is an ancestor of the other "
-"parent `M`. Still, `N` remained because it is !TREESAME."
+#, priority:260
+msgid "`N`'s parent list had `I` removed, because it is an ancestor of the other parent `M`. Still, `N` remained because it is !TREESAME."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:531
-msgid ""
-"`P`'s parent list similarly had `I` removed. `P` was then removed "
-"completely, because it had one parent and is TREESAME."
+#, priority:260
+msgid "`P`'s parent list similarly had `I` removed. `P` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:535
-msgid ""
-"`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because "
-"it was a TREESAME root. `Q` was then removed completely, because it had one "
-"parent and is TREESAME."
+#, priority:260
+msgid "`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it was a TREESAME root. `Q` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:538
+#, priority:260
msgid "Finally, there is a fifth simplification mode available:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:544
-msgid ""
-"Limit the displayed commits to those directly on the ancestry chain between "
-"the ``from'' and ``to'' commits in the given commit range. I.e. only display "
-"commits that are ancestor of the ``to'' commit and descendants of the "
-"``from'' commit."
+#, priority:260
+msgid "Limit the displayed commits to those directly on the ancestry chain between the ``from'' and ``to'' commits in the given commit range. I.e. only display commits that are ancestor of the ``to'' commit and descendants of the ``from'' commit."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:546
+#, priority:260
msgid "As an example use case, consider the following commit history:"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:553
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t D---E-------F\n"
"\t / \\ \\\n"
@@ -71566,27 +61282,19 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:561
-msgid ""
-"A regular 'D..M' computes the set of commits that are ancestors of `M`, but "
-"excludes the ones that are ancestors of `D`. This is useful to see what "
-"happened to the history leading to `M` since `D`, in the sense that ``what "
-"does `M` have that did not exist in `D`''. The result in this example would "
-"be all the commits, except `A` and `B` (and `D` itself, of course)."
+#, priority:260
+msgid "A regular 'D..M' computes the set of commits that are ancestors of `M`, but excludes the ones that are ancestors of `D`. This is useful to see what happened to the history leading to `M` since `D`, in the sense that ``what does `M` have that did not exist in `D`''. The result in this example would be all the commits, except `A` and `B` (and `D` itself, of course)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:567
-msgid ""
-"When we want to find out what commits in `M` are contaminated with the bug "
-"introduced by `D` and need fixing, however, we might want to view only the "
-"subset of 'D..M' that are actually descendants of `D`, i.e. excluding `C` "
-"and `K`. This is exactly what the `--ancestry-path` option does. Applied to "
-"the 'D..M' range, it results in:"
+#, priority:260
+msgid "When we want to find out what commits in `M` are contaminated with the bug introduced by `D` and need fixing, however, we might want to view only the subset of 'D..M' that are actually descendants of `D`, i.e. excluding `C` and `K`. This is exactly what the `--ancestry-path` option does. Applied to the 'D..M' range, it results in:"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:574
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t\tE-------F\n"
"\t\t \\ \\\n"
@@ -71597,46 +61305,37 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:583
-msgid ""
-"The `--simplify-by-decoration` option allows you to view only the big "
-"picture of the topology of the history, by omitting commits that are not "
-"referenced by tags. Commits are marked as !TREESAME (in other words, kept "
-"after history simplification rules described above) if (1) they are "
-"referenced by tags, or (2) they change the contents of the paths given on "
-"the command line. All other commits are marked as TREESAME (subject to be "
-"simplified away)."
+#, priority:260
+msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
#: en/rev-list-options.txt:587
-#, no-wrap
+#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:596
-msgid ""
-"Limit output to the one commit object which is roughly halfway between "
-"included and excluded commits. Note that the bad bisection ref "
-"`refs/bisect/bad` is added to the included commits (if it exists) and the "
-"good bisection refs `refs/bisect/good-*` are added to the excluded commits "
-"(if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
+#, priority:260
+msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:599
-#, no-wrap
+#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:602
+#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:606
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
"\t$ git rev-list midpoint ^bar ^baz\n"
@@ -71644,113 +61343,91 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:612
-msgid ""
-"would be of roughly the same length. Finding the change which introduces a "
-"regression is thus reduced to a binary search: repeatedly generate and test "
-"new 'midpoint's until the commit chain is of length one. Cannot be combined "
-"with --first-parent."
+#, priority:260
+msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:613
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
#: en/rev-list-options.txt:624
-msgid ""
-"This calculates the same as `--bisect`, except that refs in `refs/bisect/` "
-"are not used, and except that this outputs text ready to be eval'ed by the "
-"shell. These lines will assign the name of the midpoint revision to the "
-"variable `bisect_rev`, and the expected number of commits to be tested after "
-"`bisect_rev` is tested to `bisect_nr`, the expected number of commits to be "
-"tested if `bisect_rev` turns out to be good to `bisect_good`, the expected "
-"number of commits to be tested if `bisect_rev` turns out to be bad to "
-"`bisect_bad`, and the number of commits we are bisecting right now to "
-"`bisect_all`."
+#, priority:260
+msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:625
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
#: en/rev-list-options.txt:631
-msgid ""
-"This outputs all the commit objects between the included and excluded "
-"commits, ordered by their distance to the included and excluded "
-"commits. Refs in `refs/bisect/` are not used. The farthest from them is "
-"displayed first. (This is the only one displayed by `--bisect`.)"
+#, priority:260
+msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:635
-msgid ""
-"This is useful because it makes it easy to choose a good commit to test when "
-"you want to avoid to test some of them for some reason (they may not compile "
-"for example)."
+#, priority:260
+msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:639
-msgid ""
-"This option can be used along with `--bisect-vars`, in this case, after all "
-"the sorted commit objects, there will be the same text as if `--bisect-vars` "
-"had been used alone."
+#, priority:260
+msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
#: en/rev-list-options.txt:644
-#, no-wrap
+#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:647
+#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:651
-msgid ""
-"Show no parents before all of its children are shown, but otherwise show "
-"commits in the commit timestamp order."
+#, priority:260
+msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:652
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
#: en/rev-list-options.txt:655
-msgid ""
-"Show no parents before all of its children are shown, but otherwise show "
-"commits in the author timestamp order."
+#, priority:260
+msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:660
-msgid ""
-"Show no parents before all of its children are shown, and avoid showing "
-"commits on multiple lines of history intermixed."
+#, priority:260
+msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:662
+#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:668
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
"\t\\\t \\\n"
@@ -71759,529 +61436,439 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:674
-msgid ""
-"where the numbers denote the order of commit timestamps, `git rev-list` and "
-"friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 "
-"4 3 2 1."
+#, priority:260
+msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:679
-msgid ""
-"With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); "
-"some older commits are shown before newer ones in order to avoid showing the "
-"commits from two parallel development track mixed together."
+#, priority:260
+msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:684
-msgid ""
-"Output the commits chosen to be shown (see Commit Limiting section above) in "
-"reverse order. Cannot be combined with `--walk-reflogs`."
+#, priority:260
+msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
#: en/rev-list-options.txt:688
-#, no-wrap
+#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:691
+#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:693
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
#: en/rev-list-options.txt:698
-msgid ""
-"Print the object IDs of any object referenced by the listed commits. "
-"`--objects foo ^bar` thus means ``send me all object IDs which I need to "
-"download if I have the commit object _bar_ but not _foo_''."
+#, priority:260
+msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:699
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
#: en/rev-list-options.txt:703
-msgid ""
-"Print tree and blob ids in order of the commits. The tree and blob ids are "
-"printed after they are first referenced by a commit."
+#, priority:260
+msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:704
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
#: en/rev-list-options.txt:710
-msgid ""
-"Similar to `--objects`, but also print the IDs of excluded commits prefixed "
-"with a ``-'' character. This is used by linkgit:git-pack-objects[1] to "
-"build a ``thin'' pack, which records objects in deltified form based on "
-"objects contained in these excluded commits to reduce network traffic."
+#, priority:260
+msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:711
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
#: en/rev-list-options.txt:715
-msgid ""
-"Similar to `--objects-edge`, but it tries harder to find excluded commits at "
-"the cost of increased time. This is used instead of `--objects-edge` to "
-"build ``thin'' packs for shallow repositories."
+#, priority:260
+msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:716
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
#: en/rev-list-options.txt:720
-msgid ""
-"Pretend as if all trees and blobs used by the index are listed on the "
-"command line. Note that you probably want to use `--objects`, too."
+#, priority:260
+msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:724
+#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:725
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
#: en/rev-list-options.txt:728
-msgid ""
-"Only useful with `--objects`; print the names of the object IDs that are "
-"found. This is the default behavior."
+#, priority:260
+msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:729
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
#: en/rev-list-options.txt:734
-msgid ""
-"Only useful with `--objects`; does not print the names of the object IDs "
-"that are found. This inverts `--object-names`. This flag allows the output "
-"to be more easily parsed by commands such as linkgit:git-cat-file[1]."
+#, priority:260
+msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:739
-msgid ""
-"Only useful with one of the `--objects*`; omits objects (usually blobs) from "
-"the list of printed objects. The '<filter-spec>' may be one of the "
-"following:"
+#, priority:260
+msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:741
+#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:746
-msgid ""
-"The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or "
-"units. n may be zero. The suffixes k, m, and g can be used to name units "
-"in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as "
-"'blob:limit=1024'."
+#, priority:260
+msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:751
-msgid ""
-"The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout "
-"specification contained in the blob (or blob-expression) '<blob-ish>' to "
-"omit blobs that would not be not required for a sparse checkout on the "
-"requested refs."
+#, priority:260
+msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:761
-msgid ""
-"The form '--filter=tree:<depth>' omits all blobs and trees whose depth from "
-"the root tree is >= <depth> (minimum depth if an object is located at "
-"multiple depths in the commits traversed). <depth>=0 will not include any "
-"trees or blobs unless included explicitly in the command-line (or standard "
-"input when --stdin is used). <depth>=1 will include only the tree and blobs "
-"which are referenced directly by a commit reachable from <commit> or an "
-"explicitly-given object. <depth>=2 is like <depth>=1 while also including "
-"trees and blobs one more level removed from an explicitly-given commit or "
-"tree."
+#, priority:260
+msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:765
-msgid ""
-"Note that the form '--filter=sparse:path=<path>' that wants to read from an "
-"arbitrary path on the filesystem has been dropped for security reasons."
+#, priority:260
+msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:768
-msgid ""
-"Multiple '--filter=' flags can be specified to combine filters. Only objects "
-"which are accepted by every filter are included."
+#, priority:260
+msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:777
-msgid ""
-"The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be "
-"used to combined several filters, but this is harder than just repeating the "
-"'--filter' flag and is usually not necessary. Filters are joined by '{plus}' "
-"and individual filters are %-encoded (i.e. URL-encoded). Besides the "
-"'{plus}' and '%' characters, the following characters are reserved and also "
-"must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all "
-"characters with ASCII code <= `0x20`, which includes space and newline."
+#, ignore-ellipsis, priority:260
+msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:781
-msgid ""
-"Other arbitrary characters can also be encoded. For instance, "
-"'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are "
-"equivalent."
+#, priority:260
+msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:784
+#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:785
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
#: en/rev-list-options.txt:788
-msgid ""
-"Only useful with `--filter=`; prints a list of the objects omitted by the "
-"filter. Object IDs are prefixed with a ``~'' character."
+#, priority:260
+msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:795
-msgid ""
-"The form '--missing=error' requests that rev-list stop with an error if a "
-"missing object is encountered. This is the default action."
+#, priority:260
+msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:803
-msgid ""
-"The form '--missing=allow-promisor' is like 'allow-any', but will only allow "
-"object traversal to continue for EXPECTED promisor missing objects. "
-"Unexpected missing objects will raise an error."
+#, priority:260
+msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:806
-msgid ""
-"The form '--missing=print' is like 'allow-any', but will also print a list "
-"of the missing objects. Object IDs are prefixed with a ``?'' character."
+#, priority:260
+msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:813
-msgid ""
-"(For internal use only.) Prefilter object traversal at promisor boundary. "
-"This is used with partial clone. This is stronger than "
-"`--missing=allow-promisor` because it limits the traversal, rather than just "
-"silencing errors about missing objects."
+#, priority:260
+msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:815
-#, no-wrap
+#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:823
-msgid ""
-"Only show the given commits, but do not traverse their ancestors. This has "
-"no effect if a range is specified. If the argument `unsorted` is given, the "
-"commits are shown in the order they were given on the command "
-"line. Otherwise (if `sorted` or no argument was given), the commits are "
-"shown in reverse chronological order by commit time. Cannot be combined "
-"with `--graph`."
+#, priority:260
+msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:824
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
#: en/rev-list-options.txt:826
+#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
#: en/rev-list-options.txt:830
-#, no-wrap
+#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:836
-msgid ""
-"Using these options, linkgit:git-rev-list[1] will act similar to the more "
-"specialized family of commit log tools: linkgit:git-log[1], "
-"linkgit:git-show[1], and linkgit:git-whatchanged[1]"
+#, priority:260
+msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:840
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
#: en/rev-list-options.txt:842
+#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:843
-#, no-wrap
+#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:850
-msgid ""
-"Only takes effect for dates shown in human-readable format, such as when "
-"using `--pretty`. `log.date` config variable sets a default value for the "
-"log command's `--date` option. By default, dates are shown in the original "
-"time zone (either committer's or author's). If `-local` is appended to the "
-"format (e.g., `iso-local`), the user's local time zone is used instead."
+#, priority:260
+msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:855
-msgid ""
-"`--date=relative` shows dates relative to the current time, e.g. ``2 hours "
-"ago''. The `-local` option has no effect for `--date=relative`."
+#, priority:260
+msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:857
+#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:860
-msgid ""
-"`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like "
-"format. The differences to the strict ISO 8601 format are:"
+#, priority:260
+msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:862
+#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:863
+#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:864
+#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:867
-msgid ""
-"`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict "
-"ISO 8601 format."
+#, priority:260
+msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:870
-msgid ""
-"`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, "
-"often found in email messages."
+#, priority:260
+msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:872
-msgid ""
-"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` "
-"format."
+#, priority:260
+msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:881
-msgid ""
-"`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 "
-"UTC), followed by a space, and then the timezone as an offset from UTC (a "
-"`+` or `-` with four digits; the first two are hours, and the second two are "
-"minutes). I.e., as if the timestamp were formatted with `strftime(\"%s "
-"%z\")`). Note that the `-local` option does not affect the "
-"seconds-since-epoch value (which is always measured in UTC), but does switch "
-"the accompanying timezone value."
+#, priority:260
+msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:888
-msgid ""
-"`--date=human` shows the timezone if the timezone does not match the current "
-"time-zone, and doesn't print the whole date if that matches (ie skip "
-"printing year for dates that are \"this year\", but also skip the whole date "
-"itself if it's in the last few days and we can just say what weekday it "
-"was). For older dates the hour and minute is also omitted."
+#, priority:260
+msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:892
-msgid ""
-"`--date=unix` shows the date as a Unix epoch timestamp (seconds since "
-"1970). As with `--raw`, this is always in UTC and therefore `-local` has no "
-"effect."
+#, priority:260
+msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:899
-msgid ""
-"`--date=format:...` feeds the format `...` to your system `strftime`, except "
-"for %z and %Z, which are handled internally. Use `--date=format:%c` to show "
-"the date in your system locale's preferred format. See the `strftime` "
-"manual for a complete list of format placeholders. When using `-local`, the "
-"correct syntax is `--date=format-local:...`."
+#, ignore-ellipsis, priority:260
+msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:902
-msgid ""
-"`--date=default` is the default format, and is similar to `--date=rfc2822`, "
-"with a few exceptions:"
+#, priority:260
+msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:904
+#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:906
+#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:908
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
#: en/rev-list-options.txt:911
-msgid ""
-"Print the contents of the commit in raw-format; each record is separated "
-"with a NUL character."
+#, priority:260
+msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:916
-msgid ""
-"Print also the parents of the commit (in the form \"commit parent...\"). "
-"Also enables parent rewriting, see 'History Simplification' above."
+#, ignore-ellipsis, priority:260
+msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:917
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
#: en/rev-list-options.txt:920
-msgid ""
-"Print also the children of the commit (in the form \"commit child...\"). "
-"Also enables parent rewriting, see 'History Simplification' above."
+#, ignore-ellipsis, priority:260
+msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:922
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
#: en/rev-list-options.txt:924
+#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:926
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
#: en/rev-list-options.txt:931
-msgid ""
-"Mark which side of a symmetric difference a commit is reachable from. "
-"Commits from the left side are prefixed with `<` and those from the right "
-"with `>`. If combined with `--boundary`, those commits are prefixed with "
-"`-`."
+#, priority:260
+msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:933
+#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:940
-#, no-wrap
+#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
"\t / \\ /\n"
@@ -72292,18 +61879,19 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:943
+#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:946
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:953
-#, no-wrap
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
"\t>bbbbbbb... 2nd on b\n"
@@ -72315,233 +61903,187 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:955
-#, no-wrap
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
#: en/rev-list-options.txt:961
-msgid ""
-"Draw a text-based graphical representation of the commit history on the left "
-"hand side of the output. This may cause extra lines to be printed in "
-"between commits, in order for the graph history to be drawn properly. "
-"Cannot be combined with `--no-walk`."
+#, priority:260
+msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:963
+#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:966
-msgid ""
-"This implies the `--topo-order` option by default, but the `--date-order` "
-"option may also be specified."
+#, priority:260
+msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:967
-#, no-wrap
+#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:973
-msgid ""
-"When --graph is not used, all history branches are flattened which can make "
-"it hard to see that the two consecutive commits do not belong to a linear "
-"branch. This option puts a barrier in between them in that case. If "
-"`<barrier>` is specified, it is the string that will be shown instead of the "
-"default one."
+#, priority:260
+msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:983
-msgid ""
-"Print a number stating how many commits would have been listed, and suppress "
-"all other output. When used together with `--left-right`, instead print the "
-"counts for left and right commits, separated by a tab. When used together "
-"with `--cherry-mark`, omit patch equivalent commits from these counts and "
-"print the count for equivalent commits separated by a tab."
+#, priority:260
+msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
#: en/rev-list-options.txt:989
-#, no-wrap
+#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:994
-msgid ""
-"Listed below are options that control the formatting of diff output. Some "
-"of them are specific to linkgit:git-rev-list[1], however other diff options "
-"may be given. See linkgit:git-diff-files[1] for more options."
+#, priority:260
+msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:1001
-msgid ""
-"With this option, diff output for a merge commit shows the differences from "
-"each of the parents to the merge result simultaneously instead of showing "
-"pairwise diff between a parent and the result one at a time. Furthermore, it "
-"lists only files which were modified from all parents."
+#, priority:260
+msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:1007
-msgid ""
-"This flag implies the `-c` option and further compresses the patch output by "
-"omitting uninteresting hunks whose contents in the parents have only two "
-"variants and the merge result picks one of them without modification."
+#, priority:260
+msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:1022
-msgid ""
-"This flag makes the merge commits show the full diff like regular commits; "
-"for each merge parent, a separate log entry and diff is generated. An "
-"exception is that only diff against the first parent is shown when "
-"`--first-parent` option is given; in that case, the output represents the "
-"changes the merge brought _into_ the then-current branch."
+#, priority:260
+msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:1025
+#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:1028
+#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
#. type: Plain text
#: en/sequencer.txt:5
-msgid ""
-"Continue the operation in progress using the information in "
-"`.git/sequencer`. Can be used to continue after resolving conflicts in a "
-"failed cherry-pick or revert."
+#, priority:100
+msgid "Continue the operation in progress using the information in `.git/sequencer`. Can be used to continue after resolving conflicts in a failed cherry-pick or revert."
msgstr ""
#. type: Plain text
#: en/sequencer.txt:9
+#, priority:100
msgid "Skip the current commit and continue with the rest of the sequence."
msgstr ""
#. type: Plain text
#: en/sequencer.txt:14
-msgid ""
-"Forget about the current operation in progress. Can be used to clear the "
-"sequencer state after a failed cherry-pick or revert."
+#, priority:100
+msgid "Forget about the current operation in progress. Can be used to clear the sequencer state after a failed cherry-pick or revert."
msgstr ""
#. type: Plain text
#: en/sequencer.txt:16
+#, priority:100
msgid "Cancel the operation and return to the pre-sequence state."
msgstr ""
#. type: Plain text
#: en/transfer-data-leaks.txt:11
-msgid ""
-"The fetch and push protocols are not designed to prevent one side from "
-"stealing data from the other repository that was not intended to be "
-"shared. If you have private data that you need to protect from a malicious "
-"peer, your best option is to store it in another repository. This applies to "
-"both clients and servers. In particular, namespaces on a server are not "
-"effective for read access control; you should only grant read access to a "
-"namespace to clients that you would trust with read access to the entire "
-"repository."
+#, priority:220
+msgid "The fetch and push protocols are not designed to prevent one side from stealing data from the other repository that was not intended to be shared. If you have private data that you need to protect from a malicious peer, your best option is to store it in another repository. This applies to both clients and servers. In particular, namespaces on a server are not effective for read access control; you should only grant read access to a namespace to clients that you would trust with read access to the entire repository."
msgstr ""
#. type: Plain text
#: en/transfer-data-leaks.txt:13
+#, priority:220
msgid "The known attack vectors are as follows:"
msgstr ""
#. type: Plain text
#: en/transfer-data-leaks.txt:26
-msgid ""
-"The victim sends \"have\" lines advertising the IDs of objects it has that "
-"are not explicitly intended to be shared but can be used to optimize the "
-"transfer if the peer also has them. The attacker chooses an object ID X to "
-"steal and sends a ref to X, but isn't required to send the content of X "
-"because the victim already has it. Now the victim believes that the attacker "
-"has X, and it sends the content of X back to the attacker later. (This "
-"attack is most straightforward for a client to perform on a server, by "
-"creating a ref to X in the namespace the client has access to and then "
-"fetching it. The most likely way for a server to perform it on a client is "
-"to \"merge\" X into a public branch and hope that the user does additional "
-"work on this branch and pushes it back to the server without noticing the "
-"merge.)"
+#, priority:220
+msgid "The victim sends \"have\" lines advertising the IDs of objects it has that are not explicitly intended to be shared but can be used to optimize the transfer if the peer also has them. The attacker chooses an object ID X to steal and sends a ref to X, but isn't required to send the content of X because the victim already has it. Now the victim believes that the attacker has X, and it sends the content of X back to the attacker later. (This attack is most straightforward for a client to perform on a server, by creating a ref to X in the namespace the client has access to and then fetching it. The most likely way for a server to perform it on a client is to \"merge\" X into a public branch and hope that the user does additional work on this branch and pushes it back to the server without noticing the merge.)"
msgstr ""
#. type: Plain text
#: en/transfer-data-leaks.txt:30
-msgid ""
-"As in #1, the attacker chooses an object ID X to steal. The victim sends an "
-"object Y that the attacker already has, and the attacker falsely claims to "
-"have X and not Y, so the victim sends Y as a delta against X. The delta "
-"reveals regions of X that are similar to Y to the attacker."
+#, priority:220
+msgid "As in #1, the attacker chooses an object ID X to steal. The victim sends an object Y that the attacker already has, and the attacker falsely claims to have X and not Y, so the victim sends Y as a delta against X. The delta reveals regions of X that are similar to Y to the attacker."
msgstr ""
#. type: Title -
#: en/urls-remotes.txt:4
-#, no-wrap
+#, no-wrap, priority:220
msgid "REMOTES[[REMOTES]]"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:8
-msgid ""
-"The name of one of the following can be used instead of a URL as "
-"`<repository>` argument:"
+#, priority:220
+msgid "The name of one of the following can be used instead of a URL as `<repository>` argument:"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:10
+#, priority:220
msgid "a remote in the Git configuration file: `$GIT_DIR/config`,"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:11
+#, priority:220
msgid "a file in the `$GIT_DIR/remotes` directory, or"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:12
+#, priority:220
msgid "a file in the `$GIT_DIR/branches` directory."
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:15
-msgid ""
-"All of these also allow you to omit the refspec from the command line "
-"because they each contain a refspec which git will use by default."
+#, priority:220
+msgid "All of these also allow you to omit the refspec from the command line because they each contain a refspec which git will use by default."
msgstr ""
#. type: Title ~
#: en/urls-remotes.txt:17
-#, no-wrap
+#, no-wrap, priority:220
msgid "Named remote in configuration file"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:26
-msgid ""
-"You can choose to provide the name of a remote which you had previously "
-"configured using linkgit:git-remote[1], linkgit:git-config[1] or even by a "
-"manual edit to the `$GIT_DIR/config` file. The URL of this remote will be "
-"used to access the repository. The refspec of this remote will be used by "
-"default when you do not provide a refspec on the command line. The entry in "
-"the config file would appear like this:"
+#, priority:220
+msgid "You can choose to provide the name of a remote which you had previously configured using linkgit:git-remote[1], linkgit:git-config[1] or even by a manual edit to the `$GIT_DIR/config` file. The URL of this remote will be used to access the repository. The refspec of this remote will be used by default when you do not provide a refspec on the command line. The entry in the config file would appear like this:"
msgstr ""
#. type: delimited block -
#: en/urls-remotes.txt:33
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\t[remote \"<name>\"]\n"
"\t\turl = <url>\n"
@@ -72552,29 +62094,25 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:37
-msgid ""
-"The `<pushurl>` is used for pushes only. It is optional and defaults to "
-"`<url>`."
+#, priority:220
+msgid "The `<pushurl>` is used for pushes only. It is optional and defaults to `<url>`."
msgstr ""
#. type: Title ~
#: en/urls-remotes.txt:39
-#, no-wrap
+#, no-wrap, priority:220
msgid "Named file in `$GIT_DIR/remotes`"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:47
-msgid ""
-"You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL "
-"in this file will be used to access the repository. The refspec in this "
-"file will be used as default when you do not provide a refspec on the "
-"command line. This file should have the following format:"
+#, priority:220
+msgid "You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL in this file will be used to access the repository. The refspec in this file will be used as default when you do not provide a refspec on the command line. This file should have the following format:"
msgstr ""
#. type: delimited block -
#: en/urls-remotes.txt:52
-#, no-wrap
+#, no-wrap, priority:220
msgid ""
"\tURL: one of the above URL format\n"
"\tPush: <refspec>\n"
@@ -72583,231 +62121,223 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:59
-msgid ""
-"`Push:` lines are used by 'git push' and `Pull:` lines are used by 'git "
-"pull' and 'git fetch'. Multiple `Push:` and `Pull:` lines may be specified "
-"for additional branch mappings."
+#, priority:220
+msgid "`Push:` lines are used by 'git push' and `Pull:` lines are used by 'git pull' and 'git fetch'. Multiple `Push:` and `Pull:` lines may be specified for additional branch mappings."
msgstr ""
#. type: Title ~
#: en/urls-remotes.txt:61
-#, no-wrap
+#, no-wrap, priority:220
msgid "Named file in `$GIT_DIR/branches`"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:67
-msgid ""
-"You can choose to provide the name of a file in `$GIT_DIR/branches`. The "
-"URL in this file will be used to access the repository. This file should "
-"have the following format:"
+#, priority:220
+msgid "You can choose to provide the name of a file in `$GIT_DIR/branches`. The URL in this file will be used to access the repository. This file should have the following format:"
msgstr ""
#. type: delimited block -
#: en/urls-remotes.txt:71
-#, no-wrap
+#, no-wrap, priority:220
msgid "\t<url>#<head>\n"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:74
+#, priority:220
msgid "`<url>` is required; `#<head>` is optional."
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:79
-msgid ""
-"Depending on the operation, git will use one of the following refspecs, if "
-"you don't provide one on the command line. `<branch>` is the name of this "
-"file in `$GIT_DIR/branches` and `<head>` defaults to `master`."
+#, priority:220
+msgid "Depending on the operation, git will use one of the following refspecs, if you don't provide one on the command line. `<branch>` is the name of this file in `$GIT_DIR/branches` and `<head>` defaults to `master`."
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:81
+#, priority:220
msgid "git fetch uses:"
msgstr ""
#. type: delimited block -
#: en/urls-remotes.txt:84
-#, no-wrap
+#, no-wrap, priority:220
msgid "\trefs/heads/<head>:refs/heads/<branch>\n"
msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:87
+#, priority:220
msgid "git push uses:"
msgstr ""
#. type: delimited block -
#: en/urls-remotes.txt:90
-#, no-wrap
+#, no-wrap, priority:220
msgid "\tHEAD:refs/heads/<head>\n"
msgstr ""
#. type: Title -
#: en/urls.txt:2
-#, no-wrap
+#, no-wrap, priority:300
msgid "GIT URLS[[URLS]]"
msgstr ""
#. type: Plain text
#: en/urls.txt:8
-msgid ""
-"In general, URLs contain information about the transport protocol, the "
-"address of the remote server, and the path to the repository. Depending on "
-"the transport protocol, some of this information may be absent."
+#, priority:300
+msgid "In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository. Depending on the transport protocol, some of this information may be absent."
msgstr ""
#. type: Plain text
#: en/urls.txt:12
-msgid ""
-"Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps "
-"can be used for fetching, but this is inefficient and deprecated; do not use "
-"it)."
+#, priority:300
+msgid "Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)."
msgstr ""
#. type: Plain text
#: en/urls.txt:15
-msgid ""
-"The native transport (i.e. git:// URL) does no authentication and should be "
-"used with caution on unsecured networks."
+#, priority:300
+msgid "The native transport (i.e. git:// URL) does no authentication and should be used with caution on unsecured networks."
msgstr ""
#. type: Plain text
#: en/urls.txt:17
+#, priority:300
msgid "The following syntaxes may be used with them:"
msgstr ""
#. type: Plain text
#: en/urls.txt:19
+#, priority:300
msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:20
+#, priority:300
msgid "git://host.xz{startsb}:port{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:21
+#, priority:300
msgid "http{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:22
+#, priority:300
msgid "ftp{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:24
+#, priority:300
msgid "An alternative scp-like syntax may also be used with the ssh protocol:"
msgstr ""
#. type: Plain text
#: en/urls.txt:26
+#, priority:300
msgid "{startsb}user@{endsb}host.xz:path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:32
-msgid ""
-"This syntax is only recognized if there are no slashes before the first "
-"colon. This helps differentiate a local path that contains a colon. For "
-"example the local path `foo:bar` could be specified as an absolute path or "
-"`./foo:bar` to avoid being misinterpreted as an ssh url."
+#, priority:300
+msgid "This syntax is only recognized if there are no slashes before the first colon. This helps differentiate a local path that contains a colon. For example the local path `foo:bar` could be specified as an absolute path or `./foo:bar` to avoid being misinterpreted as an ssh url."
msgstr ""
#. type: Plain text
#: en/urls.txt:34
+#, priority:300
msgid "The ssh and git protocols additionally support ~username expansion:"
msgstr ""
#. type: Plain text
#: en/urls.txt:36
+#, priority:300
msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:37
+#, priority:300
msgid "git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:38
+#, priority:300
msgid "{startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:41
-msgid ""
-"For local repositories, also supported by Git natively, the following "
-"syntaxes may be used:"
+#, priority:300
+msgid "For local repositories, also supported by Git natively, the following syntaxes may be used:"
msgstr ""
#. type: Plain text
#: en/urls.txt:43
+#, priority:300
msgid "/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:44
+#, priority:300
msgid "\\file:///path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:49
-msgid ""
-"These two syntaxes are mostly equivalent, except when cloning, when the "
-"former implies --local option. See linkgit:git-clone[1] for details."
+#, priority:300
+msgid "These two syntaxes are mostly equivalent, except when cloning, when the former implies --local option. See linkgit:git-clone[1] for details."
msgstr ""
#. type: Plain text
#: en/urls.txt:54
-msgid ""
-"These two syntaxes are mostly equivalent, except the former implies --local "
-"option."
+#, priority:300
+msgid "These two syntaxes are mostly equivalent, except the former implies --local option."
msgstr ""
#. type: Plain text
#: en/urls.txt:58
-msgid ""
-"'git clone', 'git fetch' and 'git pull', but not 'git push', will also "
-"accept a suitable bundle file. See linkgit:git-bundle[1]."
+#, priority:300
+msgid "'git clone', 'git fetch' and 'git pull', but not 'git push', will also accept a suitable bundle file. See linkgit:git-bundle[1]."
msgstr ""
#. type: Plain text
#: en/urls.txt:63
-msgid ""
-"When Git doesn't know how to handle a certain transport protocol, it "
-"attempts to use the 'remote-<transport>' remote helper, if one exists. To "
-"explicitly request a remote helper, the following syntax may be used:"
+#, priority:300
+msgid "When Git doesn't know how to handle a certain transport protocol, it attempts to use the 'remote-<transport>' remote helper, if one exists. To explicitly request a remote helper, the following syntax may be used:"
msgstr ""
#. type: Plain text
#: en/urls.txt:65
+#, priority:300
msgid "<transport>::<address>"
msgstr ""
#. type: Plain text
#: en/urls.txt:69
-msgid ""
-"where <address> may be a path, a server and path, or an arbitrary URL-like "
-"string recognized by the specific remote helper being invoked. See "
-"linkgit:gitremote-helpers[7] for details."
+#, priority:300
+msgid "where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being invoked. See linkgit:gitremote-helpers[7] for details."
msgstr ""
#. type: Plain text
#: en/urls.txt:74
-msgid ""
-"If there are a large number of similarly-named remote repositories and you "
-"want to use a different format for them (such that the URLs you use will be "
-"rewritten into URLs that work), you can create a configuration section of "
-"the form:"
+#, priority:300
+msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
msgstr ""
#. type: delimited block -
#: en/urls.txt:78
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"\t[url \"<actual url base>\"]\n"
"\t\tinsteadOf = <other url base>\n"
@@ -72815,12 +62345,13 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:81 en/urls.txt:100
+#, priority:300
msgid "For example, with this:"
msgstr ""
#. type: delimited block -
#: en/urls.txt:86
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"\t[url \"git://git.host.xz/\"]\n"
"\t\tinsteadOf = host.xz:/path/to/\n"
@@ -72829,22 +62360,19 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:90
-msgid ""
-"a URL like \"work:repo.git\" or like \"host.xz:/path/to/repo.git\" will be "
-"rewritten in any context that takes a URL to be "
-"\"git://git.host.xz/repo.git\"."
+#, priority:300
+msgid "a URL like \"work:repo.git\" or like \"host.xz:/path/to/repo.git\" will be rewritten in any context that takes a URL to be \"git://git.host.xz/repo.git\"."
msgstr ""
#. type: Plain text
#: en/urls.txt:93
-msgid ""
-"If you want to rewrite URLs for push only, you can create a configuration "
-"section of the form:"
+#, priority:300
+msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
msgstr ""
#. type: delimited block -
#: en/urls.txt:97
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"\t[url \"<actual url base>\"]\n"
"\t\tpushInsteadOf = <other url base>\n"
@@ -72852,7 +62380,7 @@ msgstr ""
#. type: delimited block -
#: en/urls.txt:104
-#, no-wrap
+#, no-wrap, priority:300
msgid ""
"\t[url \"ssh://example.org/\"]\n"
"\t\tpushInsteadOf = git://example.org/\n"
@@ -72860,8 +62388,10 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:108
-msgid ""
-"a URL like \"git://example.org/path/to/repo.git\" will be rewritten to "
-"\"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use "
-"the original URL."
+#, priority:300
+msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+
+#, fuzzy
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index e8393a4..dc4b26f 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2019-10-05 21:56+0000\n"
"Last-Translator: Far찼ndula <farandula@versoblanco.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -77,7 +77,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -125,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -277,7 +277,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -709,7 +709,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr "Operaci처n bidireccional entre un repositorio Subversion y Git"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1656,8 +1656,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr "Actualiza el nombre del objeto almacenado en una referencia de forma segura"
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2452,61 +2452,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3540,7 +3540,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3552,13 +3552,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4019,7 +4019,7 @@ msgid "Synonym for `-p --stat`."
msgstr "sin처nimo para '-p --stat'"
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4051,7 +4051,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4087,7 +4087,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4107,7 +4107,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4719,15 +4719,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4857,13 +4857,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4899,7 +4899,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4941,13 +4941,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4959,7 +4959,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4971,7 +4971,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5007,13 +5007,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5103,7 +5103,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5235,7 +5235,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5247,13 +5247,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5285,7 +5285,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5357,7 +5357,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5375,7 +5375,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5399,253 +5399,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, fuzzy, priority:300
msgid "Be verbose."
msgstr "ser verboso"
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5695,7 +5695,7 @@ msgstr ""
"\t [--chmod=(+|-)x] [--] [<ruta>...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "DESCRIPCI횙N"
@@ -5737,13 +5737,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "V챕ase linkgit:git-commit[1] para otras formas de a챰adir contenido a un commit."
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OPCIONES"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5755,7 +5755,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr "Ruta de los archivos desde los que a챰adir el contenido. Pueden usarse comodines (p.e. '*.c') para incluir todos los archivos coincidentes con el patr처n. Tambi챕n puede indicarse el nombre del directorio padre (p.e. 'dir' para agregar 'dir/archivo1' y 'dir/archivo2') para actualizar el 챠ndice con el estado actual de todo el directorio (p.e. especificar 'dir' no s처lo grabar찼 la modificaci처n de 'dir/archivo1' y la creaci처n de 'dir/archivo2', sino tambi챕n el borrado de 'dir/archivo3'). N처tese que en versiones anteriores Git ignoraba los archivos eliminados; utilice la opci처n '--no-all' si desea a챰adir los archivos nuevos o modificados pero ignorar los eliminados."
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "V챕ase 'pathspec' en linkgit:gitglossary[7] para m찼s informaci처n sobre la sintaxis de <pathspec>."
@@ -5773,13 +5773,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "Agregar archivos que normalmente ser챠an ignorados."
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5803,13 +5803,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5983,44 +5983,44 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, fuzzy, no-wrap, priority:300
#| msgid "--ignore-removal"
msgid "--pathspec-from-file=<file>"
msgstr "--ignore-removal"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6062,7 +6062,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6374,7 +6374,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6386,13 +6386,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6420,7 +6420,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6442,7 +6442,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6484,7 +6484,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6514,7 +6514,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6606,37 +6606,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6696,7 +6696,7 @@ msgid "Run interactively."
msgstr "ejecutar de manera interactiva"
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6708,7 +6708,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6720,7 +6720,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6732,19 +6732,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6756,7 +6756,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6810,115 +6810,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -7004,7 +7005,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7034,8 +7035,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7046,7 +7047,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7118,7 +7119,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7141,8 +7142,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7334,7 +7335,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7364,7 +7365,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7504,7 +7505,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7694,7 +7695,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, fuzzy, no-wrap, priority:240
msgid "<tree-ish>"
msgstr "찼rbol-ismo"
@@ -9256,7 +9257,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9280,7 +9281,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9568,7 +9569,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9692,7 +9693,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10105,7 +10106,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, fuzzy, no-wrap, priority:240
msgid "<object>"
msgstr "objeto"
@@ -10141,7 +10142,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10360,7 +10361,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10684,13 +10685,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10780,7 +10781,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10931,127 +10932,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11527,7 +11534,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, fuzzy, priority:240
msgid "Quiet, suppress feedback messages."
msgstr "suprimir mensajes de feedback"
@@ -11719,7 +11726,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11905,7 +11912,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, fuzzy, priority:280
#| msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
@@ -12642,7 +12649,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12666,7 +12673,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12892,7 +12899,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13458,7 +13465,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13602,7 +13609,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13698,7 +13705,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, fuzzy, no-wrap, priority:300
msgid "<repository>"
msgstr "repositorio"
@@ -13996,7 +14003,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14056,89 +14063,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14345,7 +14328,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14441,7 +14424,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14744,13 +14727,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14760,13 +14743,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14775,19 +14758,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14797,31 +14780,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14831,55 +14814,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14900,18 +14937,18 @@ msgstr "Configurar repositorio u opciones globales"
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15092,7 +15129,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15351,204 +15388,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15559,7 +15608,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15569,7 +15618,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15579,7 +15628,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15589,7 +15638,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15601,157 +15650,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15761,13 +15810,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15780,19 +15829,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15800,13 +15849,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15893,7 +15942,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19226,7 +19275,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22497,7 +22546,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22886,7 +22935,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23645,7 +23694,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24264,7 +24313,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26029,7 +26078,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26399,7 +26448,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26475,575 +26524,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, fuzzy, priority:100
msgid "Don't match the pattern in binary files."
msgstr "no concordar patrones en archivos binarios"
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, fuzzy, priority:100
msgid "Print an empty line between matches from different files."
msgstr "imprimir una l챠nea vac챠a entre coincidencias de diferentes archivos"
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27081,7 +27148,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30595,7 +30662,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, fuzzy, no-wrap, priority:100
msgid "other"
msgstr "Otro"
@@ -30661,7 +30728,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr "<archivo>"
@@ -30789,97 +30856,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30900,7 +30967,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31408,7 +31475,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33279,7 +33346,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36160,13 +36227,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38304,7 +38371,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38334,487 +38401,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, fuzzy, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr "editar la lista de pendientes durante el rebase interactivo"
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, fuzzy, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr "ser silencioso implica --no-stat"
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38822,27 +38956,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38850,154 +38986,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39006,73 +39327,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39083,25 +39404,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39114,31 +39435,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39152,85 +39473,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39241,13 +39562,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39258,13 +39579,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39275,73 +39596,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39352,19 +39673,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39374,67 +39695,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39448,25 +39769,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39477,7 +39798,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39487,7 +39808,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39496,55 +39817,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39555,13 +39876,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39569,7 +39890,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39581,7 +39902,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39590,37 +39911,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42192,7 +42513,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43925,223 +44246,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr "Borra archivos del 찼rbol de trabajo y del 챠ndice"
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, fuzzy, priority:280
msgid "Override the up-to-date check."
msgstr "sobrescribir el check de actualizado"
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, fuzzy, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr "salir con estado cero incluso si nada coincide"
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, fuzzy, priority:280
msgid "See linkgit:git-add[1]."
msgstr "linkgit:git-add[1]"
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46674,7 +46992,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr "Poner en un stash los cambios en un directorio de trabajo sucio de todas maneras"
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46684,6 +47002,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46691,97 +47010,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46789,139 +47078,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, fuzzy, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr "git show [<opciones>] <objeto>..."
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, fuzzy, no-wrap, priority:240
msgid "store"
msgstr "puntaje"
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46930,31 +47315,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46966,13 +47351,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46987,13 +47372,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47005,19 +47390,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47032,19 +47417,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47053,7 +47438,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48034,7 +48419,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48212,7 +48597,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48490,19 +48875,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51126,7 +51517,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, fuzzy, no-wrap, priority:240
msgid "<commit>"
msgstr "`commit`"
@@ -51569,311 +51960,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, fuzzy, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr "Comandos de Porcelana principales"
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr "Interactuando con Otros"
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51882,7 +52285,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51892,613 +52295,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
-#, fuzzy, priority:100
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "linkgit:git-commit-tree[1]"
+#: en/git.txt:529
+#, priority:100
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52513,523 +52952,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -54009,7 +54448,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58349,7 +58800,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, fuzzy, priority:260
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
@@ -58784,185 +59235,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58972,7 +59435,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58982,13 +59445,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -61974,6 +62437,10 @@ msgstr ""
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+#, fuzzy
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "linkgit:git-commit-tree[1]"
+
#, ignore-same
#~ msgid "git-remote-testgit(1)"
#~ msgstr "git-remote-testgit(1)"
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index ecd88b7..b32d238 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-04-03 02:31+0000\n"
"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n"
@@ -27,12 +27,10 @@ msgstr "-b"
#: en/blame-options.txt:4
#, priority:100
msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankboundary` config option."
-msgstr ""
-"Afficher un SHA-1 vierge pour les validations de limite. Cela peut "
-"챕galement 챗tre contr척l챕 par l�셭ption de configuration `blame.blankboundary`."
+msgstr "Afficher un SHA-1 vierge pour les validations de limite. Cela peut 챕galement 챗tre contr척l챕 par l�셭ption de configuration `blame.blankboundary`."
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -80,7 +78,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -92,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -113,9 +111,7 @@ msgstr ""
#: en/blame-options.txt:30
#, priority:100
msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
-msgstr ""
-"Utiliser les r챕visions depuis le fichier-des-r챕visions au lieu d'appeler "
-"linkgit:git-rev-list[1]."
+msgstr "Utiliser les r챕visions depuis le fichier-des-r챕visions au lieu d'appeler linkgit:git-rev-list[1]."
#. type: Labeled list
#: en/blame-options.txt:31
@@ -130,7 +126,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -280,7 +276,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -313,9 +309,7 @@ msgstr "linkgit:git-blame[1]"
#: en/cmds-ancillaryinterrogators.txt:6
#, priority:100
msgid "Show what revision and author last modified each line of a file."
-msgstr ""
-"Montrer la r챕vision et l'auteur qui ont modifi챕 en dernier chaque ligne d'un "
-"fichier."
+msgstr "Montrer la r챕vision et l'auteur qui ont modifi챕 en dernier chaque ligne d'un fichier."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
@@ -327,9 +321,7 @@ msgstr "linkgit:git-count-objects[1]"
#: en/cmds-ancillaryinterrogators.txt:9
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
-msgstr ""
-"Compter le nombre non-empaquet챕 d'objets et leur consommation d'espace "
-"disque."
+msgstr "Compter le nombre non-empaquet챕 d'objets et leur consommation d'espace disque."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
@@ -521,9 +513,7 @@ msgstr "linkgit:git-mergetool[1]"
#: en/cmds-ancillarymanipulators.txt:15
#, priority:100
msgid "Run merge conflict resolution tools to resolve merge conflicts."
-msgstr ""
-"Lancer les outils de r챕solution de conflit de fusion pour r챕soudre les "
-"conflits de fusion."
+msgstr "Lancer les outils de r챕solution de conflit de fusion pour r챕soudre les conflits de fusion."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
@@ -718,7 +708,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr "Op챕ration Bidirectionnelle entre un d챕p척t Subversion et Git."
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -871,8 +861,7 @@ msgstr "linkgit:git-describe[1]"
#: en/cmds-mainporcelain.txt:39
#, priority:100
msgid "Give an object a human readable name based on an available ref."
-msgstr ""
-"Baptiser un objet avec un nom lisible bas챕 sur une r챕f챕rence disponible."
+msgstr "Baptiser un objet avec un nom lisible bas챕 sur une r챕f챕rence disponible."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
@@ -884,9 +873,7 @@ msgstr "linkgit:git-diff[1]"
#: en/cmds-mainporcelain.txt:42
#, priority:100
msgid "Show changes between commits, commit and working tree, etc."
-msgstr ""
-"Afficher les modifications entre les validations, entre validation et copie "
-"de travail, etc."
+msgstr "Afficher les modifications entre les validations, entre validation et copie de travail, etc."
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
@@ -1042,8 +1029,7 @@ msgstr "linkgit:git-range-diff[1]"
#: en/cmds-mainporcelain.txt:81
#, priority:100
msgid "Compare two commit ranges (e.g. two versions of a branch)."
-msgstr ""
-"Comparer deux plages de commits (par exemple deux versions d'une branche)."
+msgstr "Comparer deux plages de commits (par exemple deux versions d'une branche)."
#. type: Plain text
#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1172
@@ -1187,8 +1173,7 @@ msgstr "linkgit:git-tag[1]"
#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
-msgstr ""
-"Cr챕er, lister, supprimer ou v챕rifier un objet d'챕tiquette sign챕 avec GPG."
+msgstr "Cr챕er, lister, supprimer ou v챕rifier un objet d'챕tiquette sign챕 avec GPG."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:118
@@ -1224,9 +1209,7 @@ msgstr "linkgit:git-cat-file[1]"
#: en/cmds-plumbinginterrogators.txt:3
#, priority:100
msgid "Provide content or type and size information for repository objects."
-msgstr ""
-"Fournir le contenu ou l'information de type et taille pour les objets du "
-"d챕p척t."
+msgstr "Fournir le contenu ou l'information de type et taille pour les objets du d챕p척t."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
@@ -1310,9 +1293,7 @@ msgstr "linkgit:git-ls-files[1]"
#: en/cmds-plumbinginterrogators.txt:24
#, priority:100
msgid "Show information about files in the index and the working tree."
-msgstr ""
-"Afficher des informations sur les fichiers de l'index et de l'arbre de "
-"travail."
+msgstr "Afficher des informations sur les fichiers de l'index et de l'arbre de travail."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
@@ -1516,8 +1497,7 @@ msgstr "linkgit:git-hash-object[1]"
#: en/cmds-plumbingmanipulators.txt:15
#, priority:100
msgid "Compute object ID and optionally creates a blob from a file."
-msgstr ""
-"Calculer l'ID d'objet et cr챕er optionnellement un blob depuis un fichier."
+msgstr "Calculer l'ID d'objet et cr챕er optionnellement un blob depuis un fichier."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
@@ -1529,8 +1509,7 @@ msgstr "linkgit:git-index-pack[1]"
#: en/cmds-plumbingmanipulators.txt:18
#, priority:100
msgid "Build pack index file for an existing packed archive."
-msgstr ""
-"Construire un fichier d'index pack depuis une archive compact챕e existante."
+msgstr "Construire un fichier d'index pack depuis une archive compact챕e existante."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
@@ -1614,9 +1593,7 @@ msgstr "linkgit:git-prune-packed[1]"
#: en/cmds-plumbingmanipulators.txt:39
#, priority:100
msgid "Remove extra objects that are already in pack files."
-msgstr ""
-"횋liminer les objets suppl챕mentaires qui sont d챕j횪 pr챕sents dans les fichiers "
-"pack."
+msgstr "횋liminer les objets suppl챕mentaires qui sont d챕j횪 pr챕sents dans les fichiers pack."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
@@ -1676,11 +1653,10 @@ msgstr "linkgit:git-update-ref[1]"
#: en/cmds-plumbingmanipulators.txt:54
#, priority:100
msgid "Update the object name stored in a ref safely."
-msgstr ""
-"Mettre 횪 jour le nom d'objet stock챕 dans une r챕f챕rence en toute s챕curit챕."
+msgstr "Mettre 횪 jour le nom d'objet stock챕 dans une r챕f챕rence en toute s챕curit챕."
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1809,8 +1785,7 @@ msgstr "linkgit:git-interpret-trailers[1]"
#: en/cmds-purehelpers.txt:30
#, priority:100
msgid "Add or parse structured information in commit messages."
-msgstr ""
-"Ajouter ou analyser l'information structur챕e dans les messages de validation."
+msgstr "Ajouter ou analyser l'information structur챕e dans les messages de validation."
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
@@ -1822,9 +1797,7 @@ msgstr "linkgit:git-mailinfo[1]"
#: en/cmds-purehelpers.txt:33
#, priority:100
msgid "Extracts patch and authorship from a single e-mail message."
-msgstr ""
-"Extraire la rustine et l'information de d'auteur depuis un simple message de "
-"courriel."
+msgstr "Extraire la rustine et l'information de d'auteur depuis un simple message de courriel."
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
@@ -1932,8 +1905,7 @@ msgstr "linkgit:git-parse-remote[1]"
#: en/cmds-synchelpers.txt:9
#, priority:100
msgid "Routines to help parsing remote repository access parameters."
-msgstr ""
-"Routines pour aider 횪 analyser les param챔tres d'acc챔s aux d챕p척ts distants."
+msgstr "Routines pour aider 횪 analyser les param챔tres d'acc챔s aux d챕p척ts distants."
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
@@ -2041,9 +2013,7 @@ msgstr "linkgit:git-update-server-info[1]"
#: en/cmds-synchingrepositories.txt:15
#, priority:100
msgid "Update auxiliary info file to help dumb servers."
-msgstr ""
-"Mettre 횪 jour le fichier d'informations auxiliaires pour aider les serveurs "
-"idiots."
+msgstr "Mettre 횪 jour le fichier d'informations auxiliaires pour aider les serveurs idiots."
#. type: Title -
#: en/config.txt:2 en/git-worktree.txt:237
@@ -2481,61 +2451,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3580,11 +3550,7 @@ msgstr "Similaire 횪 l'ent챗te 횪 deux lignes pour le format diff unifi챕 tradit
#: en/diff-generate-patch.txt:154
#, priority:260
msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
-msgstr ""
-"Cependant, si l'option --combined-all-paths est fournie, au lieu des deux "
-"lignes de fichier-source/fichier-cible, vous obtenez un en-t챗te de N+1 "
-"lignes de fichier-source/fichier-cible, o첫 N est le nombre de parents dans "
-"le commit de fusion"
+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:163
@@ -3635,7 +3601,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr "Quand affich챕 par `git diff-tree -c`, les parents du commit de fusion sont compar챕s avec le r챕sultat de fusion (c-횪-d fichier1..fichierN sont les parents)혻; Quand affich챕 par `git diff-files -c`, les deux parents de fusion non r챕solue sont compar챕s avec le fichier dans l'arbre de travail (c-횪-d fichier1 est stage 2, 짬혻notre version혻쨩, fichier2 est stage 3, 짬혻leur version혻쨩)."
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3647,13 +3613,13 @@ msgid "Generate plain patches without any diffstats."
msgstr "G챕n챕rer des correctifs normaux sans aucun diffstat."
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4119,7 +4085,7 @@ msgid "Synonym for `-p --stat`."
msgstr "Synonyme de `-p --stat`."
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4153,7 +4119,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr "Sans cette option, les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])."
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4189,7 +4155,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr "Sp챕cifier comment les diff챕rences dans les sous-modules sont affich챕es. Lorsque vous sp챕cifiez `--submodule=short`, le format 'short' (court) est utilis챕. Ce format n'affiche que le nom des commits du d챕but et de la fin de la plage. Quand `--submodule` ou `--submodule=log` est sp챕cifi챕, le format 'log' (journal) est utilis챕. Ce format liste les commits dans la plage comme le fait `summary` de linkgit:git-submodule[1]. Quand `--submodule=diff` est sp챕cifi챕, le format 'diff' est utilis챕. Ce format affiche une diff en ligne des modifications dans le sous-module pour la plage de commits. Vaut par d챕faut `diff.submodule` ou le format 'short' si l'option de configuration n'est pas renseign챕e."
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr "--color[=<quand>]"
@@ -4211,7 +4177,7 @@ msgstr ""
"\t`color.ui` et `color.diff`.\n"
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4836,11 +4802,15 @@ msgstr "Pour illustrer la diff챕rence entre `-S<regex> --pickaxe-regex` et `-G<r
#. type: delimited block -
#: en/diff-options.txt:573
-#, ignore-ellipsis, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid ""
+#| "+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+#| "...\n"
+#| "- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
"...\n"
@@ -4848,8 +4818,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
-#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+#, fuzzy, priority:280
+#| msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr "Alors que `git log -G\"regexec\\(regexp\"` affichera ce commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` ne l'affichera pas (parce que le nombre d'occurrences de cette cha챤ne n'a pas chang챕)."
#. type: Plain text
@@ -4979,13 +4950,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr "Lorsque lanc챕 depuis un sous-r챕pertoire du projet, il peut lui 챗tre indiqu챕 d'exclure les modifications hors du r챕pertoire et d'afficher les noms de chemins relativement 횪 lui avec cette option. Quand vous n'챗tes pas dans un sous-r챕pertoire (par ex. dans un d챕p척t nu), vous pouvez nommer quel sous-r챕pertoire par rapport auquel afficher la sortie en fournissant un argument <chemin>."
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -5021,7 +4992,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -5063,13 +5034,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr "Afficher le contexte entre des sections de diff, jusqu'au nombre sp챕cifi챕 de lignes, fusionnant de ce fait les sections qui sont proches. Par d챕faut, `diff.interHunkContext` ou 0 si l'option de configuration n'est pas configur챕e."
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr "-W"
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -5081,7 +5052,7 @@ msgid "Show whole surrounding functions of changes."
msgstr "Afficher le corps des fonctions englobant les modifications."
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -5093,7 +5064,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr "Faire sortir le programme avec un code similaire 횪 diff(1). Autrement dit, il sort avec 1 s'il y avait des diff챕rences et 0 signifie aucune diff챕rence."
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5129,13 +5100,13 @@ msgid "Disallow external diff drivers."
msgstr "D챕sactiver les pilotes de diff externes."
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5225,7 +5196,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr "Pour une explication plus d챕taill챕e sur ces options communes, voir aussi linkgit:gitdiffcore[7]."
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5357,7 +5328,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5369,13 +5340,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5407,7 +5378,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5479,7 +5450,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr "-P"
@@ -5497,7 +5468,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5521,253 +5492,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr "--jobs=<n>"
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr "--submodule-prefix=<chemin>"
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <upload-pack>"
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "Mode bavard."
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "L'챕tat d'avancement est affich챕 sur la sortie d'erreur standard quand elle est attach챕e 횪 un terminal, 횪 moins que -q soit sp챕cifi챕. Ce drapeau force l'챕tat d'avancement m챗me si le flux d'erreur standard n'est pas dirig챕 vers un terminal."
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr "-o <option>"
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--server-option=<option>"
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr "Transmettre la cha챤ne donn챕e au serveur lors d'une communication utilisant la version 2 du protocole. La cha챤ne donn챕e ne doit pas contenir de caract챔re NUL ou LF. La gestion par le serveur des options du serveur, y compris les options inconnues, est sp챕cifique au serveur. Lorsque plusieurs `---server-option=<option>' sont donn챕s, ils sont tous envoy챕s 횪 l'autre c척t챕 dans l'ordre indiqu챕 sur la ligne de commande."
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5813,7 +5784,7 @@ msgstr ""
"\t [--] [<sp챕cificateur de chemin>...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
@@ -5855,13 +5826,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "R챕f챕rez-vous linkgit:git-commit[1] pour des m챕thodes alternatives d'ajout de contenu 횪 une validation."
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OPTIONS"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<sp챕cificateur de chemin>..."
@@ -5873,7 +5844,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr "Fichiers dont le contenu doit 챗tre ajout챕. Les patrons (ex : `*.c`) permettent de restreindre 횪 tous les fichiers correspondants. Un nom de r챕pertoire (ex : `rep` pour ajouter `rep/fichier1` et `rep/fichier2`) permet d'ajouter r챕cursivement tous les fichiers d'un r챕pertoire (par exemple sp챕cifier `rep` n'enregistrera pas seulement le fichier modifi챕 dans l'arbre de travail `rep/fichier1` ou un fichier ajout챕 `rep/fichier2`, mais aussi un fichier `rep/fichier3` supprim챕 de l'arbre de travail). Veuillez noter que des version anciennes de Git ignoraient les fichiers supprim챕s혻; utilisez l'option `--no-all` si vous souhaitez ajouter les fichiers nouveaux ou modifi챕s mais ignorer les fichiers supprim챕s."
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "Pour de plus amples d챕tails sur la syntaxe <sp챕cificateur de chemin>, r챕f챕rez-vous 횪 la section 'pathspec' dans linkgit:gitglossary[7]."
@@ -5891,13 +5862,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "Permettre l'ajout de fichiers qui sont normalement ignor챕s."
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5921,13 +5892,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr "Cela lance effectivement `add --interactive` mais court-circuite le menu initial et saute directement 횪 la sous-commande `patch`. R챕f챕rez-vous 횪 짬혻Mode interactif혻쨩 pour plus de d챕tails."
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -6101,43 +6072,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr "Forcer le bit ex챕cutable des fichiers ajout챕s. Le bit ex챕cutable n'est modifi챕 que dans l'index, les fichiers de la copie de travail ne sont pas modifi챕s."
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr "--pathspec-from-file=<fichier>"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr "Le sp챕cificateur de chemin est pass챕 dans `<fichier>` au lieu des arguments de la ligne de commande. Si `<fichier>` vaut `-` alors l'entr챕e standard est utilis챕e. Les 챕l챕ments du sp챕cificateur de chemin sont s챕par챕s par LF ou CR/LF. Les 챕l챕ments du sp챕cificateur de chemin peuvent 챗tre cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1]). Voir aussi l'option `--pathspec-file-nul` et l'option globale `--literal-pathspecs`."
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr "Uniquement significatif avec `--pathspec-from-file`. Les 챕l챕ments du sp챕cificateur de chemin sont s챕par챕s par le caract챔re NUL et tous les autres caract챔res sont utilis챕s litt챕ralement (y compris les retours 횪 la ligne et les guillemets)."
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr "Cette option permet de s챕parer les options de la ligne de commande de la liste des fichiers (utile si certains noms de fichiers peuvent 챗tre confondus avec des options)."
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "EXEMPLES"
@@ -6179,7 +6150,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr "Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque (c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il ne traite pas `subdir/git-foo.sh`."
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "MODE INTERACTIF"
@@ -6220,9 +6191,7 @@ msgstr "Vous pouvez indiquer `s` ou `sta` ou `status` dans le cas ci-dessus, 횪
#: en/git-add.txt:256
#, priority:300
msgid "The main command loop has 6 subcommands (plus help and quit)."
-msgstr ""
-"La boucle de commande principale propose 6 sous-commandes (plus help (aide) "
-"et quit (quitter))."
+msgstr "La boucle de commande principale propose 6 sous-commandes (plus help (aide) et quit (quitter))."
#. type: Labeled list
#: en/git-add.txt:257
@@ -6517,7 +6486,7 @@ msgid "modifying the contents of context or removal lines"
msgstr "modification de contenu de contexte ou de lignes supprim챕es"
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
@@ -6529,13 +6498,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr "Fait partie de la suite linkgit:git[1]"
@@ -6554,7 +6523,16 @@ msgstr "git-am - Appliquer une s챕rie de rustines depuis des fichiers mailbox"
#. type: Plain text
#: en/git-am.txt:20
-#, ignore-ellipsis, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#| msgid ""
+#| "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
+#| "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
+#| "\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n"
+#| "\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n"
+#| "\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
+#| "\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
+#| "\t [(<mbox> | <Maildir>)...]\n"
+#| "'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
msgid ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -6563,7 +6541,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -6593,7 +6571,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr "La liste de fichiers de bo챤te aux lettres desquelles on lit les rustines. Si vous ne fournissez pas cet argument, la commande lit depuis l'entr챕e standard. Si vous fournissez des r챕pertoires, ils sont lus comme des Maildirs."
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6635,7 +6613,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr "Avec `--keep-cr`, appeler 'git mailsplit' (voir linkgit:git-mailsplit[1]) avec la m챗me option, pour l'emp챗cher de supprimer les CR en fin de ligne. La variable de configuration `am.keepcr` peut 챗tre utilis챕e pour sp챕cifier le comportement par d챕faut. `--no-keep-cr` permet de surcharger `am.keepcr`."
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6665,7 +6643,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr "Ignorer les lignes ciseaux (voir linkgit:git-mailinfo[1])."
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6759,37 +6737,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr "Quand la rustine ne s'applique pas correctement, revenir 횪 une fusion 횪 3 points si la rustine contient l'identit챕 des blobs auxquels elle est suppos챕e s'appliquer et que ces blobs sont disponibles localement. `--no-3way` permet de surcharger la variable de configuration am.threeWay. Pour plus d'information, r챕f챕rez-vous 횪 am.threeWay dans linkgit:git-config[1]."
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr "Permettre au m챕canisme rerere de mettre 횪 jour l'index avec le r챕sultat de la r챕solution automatique des conflits si possible."
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr "--whitespace=<option>"
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr "-C<n>"
@@ -6849,7 +6827,7 @@ msgid "Run interactively."
msgstr "Lancer de mani챔re interactive."
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6861,7 +6839,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6873,7 +6851,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6885,19 +6863,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr "-S[<idcl챕>]"
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr "--gpg-sign[=<idcl챕>]"
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr "Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace."
@@ -6909,7 +6887,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6948,8 +6926,7 @@ msgstr "--abort"
#: en/git-am.txt:174
#, priority:100
msgid "Restore the original branch and abort the patching operation."
-msgstr ""
-"Restaurer la branche originale et abandonner les op챕rations de rustinage."
+msgstr "Restaurer la branche originale et abandonner les op챕rations de rustinage."
#. type: Labeled list
#: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:256 en/sequencer.txt:10
@@ -6964,115 +6941,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr "DISCUSSION"
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr "CROCHETS"
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr "Cette commande peut lancer les crochets `applypatch-msg`, `pre-applypatch` et `post-applypatch`. Voir linkgit:githooks[5] pour de plus amples informations."
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -7158,7 +7136,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr "Prendre le message de validation depuis le fichier indiqu챕. Utilisez '-' pour lire le message depuis l'entr챕e standard."
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7173,11 +7151,7 @@ msgstr ""
#: en/git-apply.txt:51
#, priority:100
msgid "Similar to `--stat`, but shows the number of added and deleted lines in decimal notation and the pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. Turns off \"apply\"."
-msgstr ""
-"Similaire 횪 `--stat`, mais afficher le nombre de lignes ajout챕es ou "
-"supprim챕es en notation d챕cimale et le nom de chemin sans abr챕viation, pour "
-"le rendre plus facile 횪 traiter automatiquement. Pour les fichiers binaires, "
-"affiche deux `-` au lieu de `0 0`. D챕sactive \"apply\"."
+msgstr "Similaire 횪 `--stat`, mais afficher le nombre de lignes ajout챕es ou supprim챕es en notation d챕cimale et le nom de chemin sans abr챕viation, pour le rendre plus facile 횪 traiter automatiquement. Pour les fichiers binaires, affiche deux `-` au lieu de `0 0`. D챕sactive \"apply\"."
#. type: Plain text
#: en/git-apply.txt:57
@@ -7192,8 +7166,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7204,7 +7178,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7276,7 +7250,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7299,8 +7273,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7492,7 +7466,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr "CONFIGURATION"
@@ -7522,7 +7496,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr "SOUS-MODULES"
@@ -7662,7 +7636,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7852,7 +7826,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr "<arbre-esque>"
@@ -8101,9 +8075,7 @@ msgstr "git-bisect(1)"
#: en/git-bisect.txt:7
#, priority:100
msgid "git-bisect - Use binary search to find the commit that introduced a bug"
-msgstr ""
-"git-bisect - Trouver par recherche binaire la modification qui a introduit "
-"un bogue"
+msgstr "git-bisect - Trouver par recherche binaire la modification qui a introduit un bogue"
#. type: Plain text
#: en/git-bisect.txt:13
@@ -8866,9 +8838,7 @@ msgstr "git-blame(1)"
#: en/git-blame.txt:7
#, priority:100
msgid "git-blame - Show what revision and author last modified each line of a file"
-msgstr ""
-"git-blame - Montrer la r챕vision et l'auteur qui ont modifi챕 en dernier "
-"chaque ligne d'un fichier"
+msgstr "git-blame - Montrer la r챕vision et l'auteur qui ont modifi챕 en dernier chaque ligne d'un fichier"
#. type: Plain text
#: en/git-blame.txt:16
@@ -8924,9 +8894,7 @@ msgstr ""
#: en/git-blame.txt:55
#, priority:100
msgid "Use the same output mode as linkgit:git-annotate[1] (Default: off)."
-msgstr ""
-"Utiliser le m챗me mode de sortie que linkgit:git-annotate[1] (D챕faut : "
-"d챕sactiv챕)."
+msgstr "Utiliser le m챗me mode de sortie que linkgit:git-annotate[1] (D챕faut : d챕sactiv챕)."
#. type: Labeled list
#: en/git-blame.txt:56
@@ -9393,27 +9361,13 @@ msgstr "--create-reflog"
#: en/git-branch.txt:115
#, priority:240
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
-msgstr ""
-"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`."
+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
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`)."
+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
@@ -9452,7 +9406,7 @@ 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:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr "-C"
@@ -9467,22 +9421,16 @@ msgstr "Raccourci pour `--copy-force`."
#: en/git-branch.txt:143
#, priority:240
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
-msgstr ""
-"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 쨩."
+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
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`."
+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:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9509,10 +9457,7 @@ msgstr "--no-column"
#: en/git-branch.txt:158
#, priority:240
msgid "Display branch listing in columns. See configuration variable column.branch for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
-msgstr ""
-"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'."
+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
@@ -9530,27 +9475,19 @@ msgstr "--remotes"
#: en/git-branch.txt:165
#, priority:240
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)."
+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
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."
+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
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)."
+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
@@ -9562,9 +9499,7 @@ msgstr "--show-current"
#: en/git-branch.txt:180
#, priority:240
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챕."
+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
@@ -9576,21 +9511,13 @@ msgstr "-vv"
#: en/git-branch.txt:191
#, priority:240
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the 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)."
+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
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."
+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: Labeled list
#: en/git-branch.txt:197
@@ -9602,10 +9529,7 @@ msgstr "--abbrev=<longueur>"
#: en/git-branch.txt:201
#, priority:240
msgid "Alter the sha1's minimum display length in the output listing. The default value is 7 and can be overridden by the `core.abbrev` config option."
-msgstr ""
-"Modifier la longueur minimale d'affichage du sha1 dans la liste de sortie. "
-"La valeur par d챕faut est 7 et peut 챗tre remplac챕e par l'option de "
-"configuration `core.abbrev`."
+msgstr "Modifier la longueur minimale d'affichage du sha1 dans la liste de sortie. 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:202
@@ -9617,9 +9541,7 @@ msgstr "--no-abbrev"
#: en/git-branch.txt:204
#, priority:240
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."
+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:206 en/git-checkout.txt:158 en/git-switch.txt:152
@@ -9631,25 +9553,13 @@ msgstr "--track"
#: en/git-branch.txt:214
#, priority:240
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
-msgstr ""
-"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."
+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:220
#, priority:240
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git 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."
+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:221 en/git-checkout.txt:172 en/git-switch.txt:167
@@ -9667,9 +9577,7 @@ msgstr "Ne pas renseigner la configuration 짬혻amont혻쨩, m챗me si la configurat
#: en/git-branch.txt:228
#, priority:240
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
-msgstr ""
-"Comme cette option avait une syntaxe confuse, elle n'est plus support챕e. "
-"Veuillez utiliser `--track` ou `--set-upstream-to` 횪 la place."
+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:229
@@ -9687,10 +9595,7 @@ msgstr "--set-upstream-to=<amont>"
#: en/git-branch.txt:234
#, priority:240
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
-msgstr ""
-"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."
+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:235
@@ -9702,9 +9607,7 @@ msgstr "--unset-upstream"
#: en/git-branch.txt:238
#, priority:240
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
-msgstr ""
-"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."
+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:239
@@ -9716,11 +9619,7 @@ msgstr "--edit-description"
#: en/git-branch.txt:244
#, priority:240
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
-msgstr ""
-"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."
+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:245 en/git-tag.txt:142
@@ -9732,9 +9631,7 @@ msgstr "--contains [<commit>]"
#: en/git-branch.txt:248
#, priority:240
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`."
+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:249 en/git-tag.txt:146
@@ -9746,9 +9643,7 @@ msgstr "--no-contains [<commit>]"
#: en/git-branch.txt:252
#, priority:240
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"N'indiquer que les branches qui contiennent le commit sp챕cifi챕 (HEAD si non "
-"sp챕cifi챕). Implique `--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:253 en/git-tag.txt:150
@@ -9760,10 +9655,7 @@ msgstr "--merged [<commit>]"
#: en/git-branch.txt:257
#, priority:240
msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--no-merged`."
-msgstr ""
-"N'indiquer que les branches dont les sommets sont accessibles depuis le "
-"commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`, incompatible avec "
-"`--no-merged`."
+msgstr "N'indiquer que les branches dont les sommets sont accessibles depuis le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`, incompatible avec `--no-merged`."
#. type: Labeled list
#: en/git-branch.txt:258 en/git-tag.txt:154
@@ -9775,10 +9667,7 @@ msgstr "--no-merged [<commit>]"
#: en/git-branch.txt:262
#, priority:240
msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--merged`."
-msgstr ""
-"N'indiquer que les branches dont les sommets sont accessibles depuis le "
-"commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`, incompatible avec "
-"`--no-merged`."
+msgstr "N'indiquer que les branches dont les sommets sont accessibles depuis le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`, incompatible avec `--no-merged`."
#. type: Labeled list
#: en/git-branch.txt:263
@@ -9790,11 +9679,7 @@ msgstr "<nom-de-branche>"
#: en/git-branch.txt:268
#, priority:240
msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name."
-msgstr ""
-"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."
+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
@@ -9806,10 +9691,7 @@ msgstr "<point_de_d챕part>"
#: en/git-branch.txt:273
#, priority:240
msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead."
-msgstr ""
-"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."
+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
@@ -9833,12 +9715,10 @@ msgstr "<nouvelle_branche>"
#: en/git-branch.txt:280
#, priority:240
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."
+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:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr "--sort=<cl챕>"
@@ -9966,7 +9846,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10356,9 +10236,7 @@ msgstr "git-cat-file(1)"
#: en/git-cat-file.txt:7
#, priority:100
msgid "git-cat-file - Provide content or type and size information for repository objects"
-msgstr ""
-"git-cat-file - Fournir le contenu ou l'information de type et taille pour "
-"les objets du d챕p척t"
+msgstr "git-cat-file - Fournir le contenu ou l'information de type et taille pour les objets du d챕p척t"
#. type: Plain text
#: en/git-cat-file.txt:14
@@ -10381,7 +10259,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr "<objet>"
@@ -10417,7 +10295,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr "<type>"
@@ -10636,7 +10514,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr "SORTIE"
@@ -10960,13 +10838,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr "Ne prendre en compte `.gitattributes` dans l'index seulement, en ignorant l'arbre de travail."
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -11056,7 +10934,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -11207,127 +11085,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11670,10 +11554,8 @@ msgstr ""
"'git checkout' [-q] [-f] [-m] [<branche>]\n"
"'git checkout' [-q] [-f] [-m] --detach [<branche>]\n"
"'git checkout' [-q] [-f] [-m] [--detach] <commit>\n"
-"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <nouvelle_branche>] "
-"[<point_de_d챕part>]\n"
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<arbre-esque>] "
-"[--] <sp챕cificateur-de-chemin>...-from-file=<fichier> [--pathspec-file-nul]\n"
+"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <nouvelle_branche>] [<point_de_d챕part>]\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<arbre-esque>] [--] <sp챕cificateur-de-chemin>...-from-file=<fichier> [--pathspec-file-nul]\n"
" 'git checkout' [<tree-ish>] [--] <sp챕cificateur-de-chemin>...\n"
" 'git checkout' (-p|--patch) [<arbre-esque>] [--] [<chemins>...]\n"
@@ -11681,11 +11563,7 @@ msgstr ""
#: en/git-checkout.txt:25
#, priority:240
msgid "Updates files in the working tree to match the version in the index or the specified tree. If no pathspec was given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch."
-msgstr ""
-"Met 횪 jour les fichiers dans l'arbre de travail pour correspondre 횪 la "
-"version dans l'index ou dans l'arbre sp챕cifi챕. Si aucun sp챕cificateur de "
-"chemin n'est fourni, 'git checkout' met aussi 횪 jour `HEAD` pour positionner "
-"la branche sp챕cifi챕e comme la branche actuelle."
+msgstr "Met 횪 jour les fichiers dans l'arbre de travail pour correspondre 횪 la version dans l'index ou dans l'arbre sp챕cifi챕. Si aucun sp챕cificateur de chemin n'est fourni, 'git checkout' met aussi 횪 jour `HEAD` pour positionner la branche sp챕cifi챕e comme la branche actuelle."
#. type: Labeled list
#: en/git-checkout.txt:26
@@ -11697,21 +11575,13 @@ msgstr "'git checkout' [<branche>]"
#: en/git-checkout.txt:32
#, priority:240
msgid "To prepare for working on `<branch>`, switch to it by updating the index and the files in the working tree, and by pointing `HEAD` at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the `<branch>`."
-msgstr ""
-"Pour se pr챕parer 횪 travailler sur `<branche>`, basculer dessus en mettant "
-"l'index et les fichiers de l'arbre de travail 횪 jour, et en pointant `HEAD` "
-"sur cette branche. Les modifications locales aux fichiers de l'arbre de "
-"travail sont conserv챕es, de sorte qu'elles peuvent 챗tre valid챕es sur la "
-"`<branche>`."
+msgstr "Pour se pr챕parer 횪 travailler sur `<branche>`, basculer dessus en mettant l'index et les fichiers de l'arbre de travail 횪 jour, et en pointant `HEAD` sur cette branche. Les modifications locales aux fichiers de l'arbre de travail sont conserv챕es, de sorte qu'elles peuvent 챗tre valid챕es sur la `<branche>`."
#. type: Plain text
#: en/git-checkout.txt:36
#, priority:240
msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name and `--no-guess` is not specified, treat as equivalent to"
-msgstr ""
-"Si la `<branche>` n'est pas trouv챕e mais qu'il existe une branche de suivi "
-"pour un d챕p척t distant unique (appel챕e `<distant>`) avec un nom correspondant "
-"et `--no-guess` n'est pas sp챕cifi챕, le traiter comme 챕quivalent 횪"
+msgstr "Si la `<branche>` n'est pas trouv챕e mais qu'il existe une branche de suivi pour un d챕p척t distant unique (appel챕e `<distant>`) avec un nom correspondant et `--no-guess` n'est pas sp챕cifi챕, le traiter comme 챕quivalent 횪"
#. type: delimited block -
#: en/git-checkout.txt:39 en/git-checkout.txt:184
@@ -11723,11 +11593,7 @@ msgstr "$ git checkout -b <branche> --track <distant>/<branche>\n"
#: en/git-checkout.txt:45
#, priority:240
msgid "You could omit `<branch>`, in which case the command degenerates to \"check out the current branch\", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch."
-msgstr ""
-"Vous pourriez omettre `<branche>`, auquel cas la commande d챕g챕n챔re en 짬 "
-"extraire la branche actuelle혻쨩, qui est une op챕ration nulle de luxe avec des "
-"effets de bord plut척t chers de ne montrer que l'information de suivi, si "
-"elle existe, pour la branche actuelle."
+msgstr "Vous pourriez omettre `<branche>`, auquel cas la commande d챕g챕n챔re en 짬 extraire la branche actuelle혻쨩, qui est une op챕ration nulle de luxe avec des effets de bord plut척t chers de ne montrer que l'information de suivi, si elle existe, pour la branche actuelle."
#. type: Labeled list
#: en/git-checkout.txt:46
@@ -11745,9 +11611,7 @@ msgstr "Sp챕cifier `-b` provoque la cr챕ation d'une nouvelle branche comme si li
#: en/git-checkout.txt:57
#, priority:240
msgid "If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
-msgstr ""
-"Si `-B` est fourni, `<nouvelle_branche>` est cr챕챕e si elle n'existe pas혻; "
-"sinon, elle est r챕initialis챕e. C'est l'챕quivalent transactionnel de"
+msgstr "Si `-B` est fourni, `<nouvelle_branche>` est cr챕챕e si elle n'existe pas혻; sinon, elle est r챕initialis챕e. C'est l'챕quivalent transactionnel de"
#. type: delimited block -
#: en/git-checkout.txt:61
@@ -11781,21 +11645,13 @@ msgstr "'git checkout' [--detach] <commit>"
#: en/git-checkout.txt:75
#, priority:240
msgid "Prepare to work on top of `<commit>`, by detaching `HEAD` at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
-msgstr ""
-"Pr챕pare 횪 travailler par-dessus `<commit>`, en d챕tachant `HEAD` dessus (voir "
-"la section 짬혻HEAD D횋TACH횋E혻쨩), et en mettant l'index et les fichiers de "
-"l'arbre de travail 횪 jour. Les modifications locales des fichiers dans "
-"l'arbre de travail sont conserv챕es, de sorte que l'arbre de travail sera le "
-"r챕sultat du commit plus les modifications locales."
+msgstr "Pr챕pare 횪 travailler par-dessus `<commit>`, en d챕tachant `HEAD` dessus (voir la section 짬혻HEAD D횋TACH횋E혻쨩), et en mettant l'index et les fichiers de l'arbre de travail 횪 jour. Les modifications locales des fichiers dans l'arbre de travail sont conserv챕es, de sorte que l'arbre de travail sera le r챕sultat du commit plus les modifications locales."
#. type: Plain text
#: en/git-checkout.txt:79
#, priority:240
msgid "When the `<commit>` argument is a branch name, the `--detach` option can be used to detach `HEAD` at the tip of the branch (`git checkout <branch>` would check out that branch without detaching `HEAD`)."
-msgstr ""
-"Quand l'argument `<commit>` est un nom de branche, l'option `--detach` peut "
-"챗tre utilis챕e pour d챕tacher `HEAD` au sommet de la branche (`git checkout "
-"<branche>` extrairait cette branche sans d챕tacher `HEAD`)."
+msgstr "Quand l'argument `<commit>` est un nom de branche, l'option `--detach` peut 챗tre utilis챕e pour d챕tacher `HEAD` au sommet de la branche (`git checkout <branche>` extrairait cette branche sans d챕tacher `HEAD`)."
#. type: Plain text
#: en/git-checkout.txt:81
@@ -11807,9 +11663,7 @@ msgstr "Omettre `<branche>` d챕tache `HEAD` au sommet de la branche actuelle."
#: en/git-checkout.txt:82
#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>..."
-msgstr ""
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<arbre-esque>] "
-"[--] <sp챕c. de chemin>..."
+msgstr "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<arbre-esque>] [--] <sp챕c. de chemin>..."
#. type: Labeled list
#: en/git-checkout.txt:83
@@ -11839,14 +11693,10 @@ msgstr "'git checkout' (-p|--patch) [<arbre-esque>] [--] [<sp챕c. de chemin>...]
#: en/git-checkout.txt:104
#, priority:240
msgid "This is similar to the previous mode, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result. See below for the description of `--patch` option."
-msgstr ""
-"C'est similaire au mode pr챕c챕dent, mais vous laisse utiliser l'interface "
-"interactive pour afficher la sortie 짬혻diff혻쨩 et choisir quelles sections "
-"utiliser dans le r챕sultat. Voir plus bas la description de l'option "
-"`--patch`."
+msgstr "C'est similaire au mode pr챕c챕dent, mais vous laisse utiliser l'interface interactive pour afficher la sortie 짬혻diff혻쨩 et choisir quelles sections utiliser dans le r챕sultat. Voir plus bas la description de l'option `--patch`."
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr "Silencieux, supprimer les messages d'챕tat."
@@ -11867,10 +11717,7 @@ msgstr "L'챕tat d'avancement est affich챕 sur la sortie standard d'erreur par d
#: en/git-checkout.txt:123
#, priority:240
msgid "When switching branches, proceed even if the index or the working tree differs from `HEAD`. This is used to throw away local changes."
-msgstr ""
-"Lors du basculement de branche, continuer m챗me si l'index ou l'arbre de "
-"travail sont diff챕rents de `HEAD`. Ceci peut servir 횪 챕liminer des "
-"modifications locales."
+msgstr "Lors du basculement de branche, continuer m챗me si l'index ou l'arbre de travail sont diff챕rents de `HEAD`. Ceci peut servir 횪 챕liminer des modifications locales."
#. type: Plain text
#: en/git-checkout.txt:126
@@ -11918,9 +11765,7 @@ msgstr "-b <nouvelle_branche>"
#: en/git-checkout.txt:150
#, priority:240
msgid "Create a new branch named `<new_branch>` and start it at `<start_point>`; see linkgit:git-branch[1] for details."
-msgstr ""
-"Cr챕er une nouvelle branche nomm챕e `<nouvelle_branche>` et la commencer 횪 "
-"`<point_de_d챕part>`혻; voir linkgit:git-branch[1] pour plus de d챕tails."
+msgstr "Cr챕er une nouvelle branche nomm챕e `<nouvelle_branche>` et la commencer 횪 `<point_de_d챕part>`혻; voir linkgit:git-branch[1] pour plus de d챕tails."
#. type: Labeled list
#: en/git-checkout.txt:151
@@ -11932,11 +11777,7 @@ msgstr "-B <nouvelle_branche>"
#: en/git-checkout.txt:156
#, priority:240
msgid "Creates the branch `<new_branch>` and start it at `<start_point>`; if it already exists, then reset it to `<start_point>`. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
-msgstr ""
-"Cr챕er la branche `<nouvelle_branche>` et la commencer 횪 `<point_de_d챕part>`혻;"
-" si elle existe d챕j횪, alors la r챕initialise 횪 `<point_de_d챕part>`. C'est "
-"챕quivalent 횪 lancer 'git branch' avec `-f`혻; voir linkgit:git-branch[1] pour "
-"plus de d챕tails."
+msgstr "Cr챕er la branche `<nouvelle_branche>` et la commencer 횪 `<point_de_d챕part>`혻; si elle existe d챕j횪, alors la r챕initialise 횪 `<point_de_d챕part>`. C'est 챕quivalent 횪 lancer 'git branch' avec `-f`혻; voir linkgit:git-branch[1] pour plus de d챕tails."
#. type: Plain text
#: en/git-checkout.txt:161
@@ -11948,24 +11789,13 @@ msgstr "� la cr챕ation d'une nouvelle branche, 챕tablir la configuration 'upstr
#: en/git-checkout.txt:171
#, priority:240
msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
-msgstr ""
-"Si aucune option `-b` n'est fournie, le nom de la nouvelle branche sera "
-"d챕riv챕 de la branche de suivi 횪 distance, en regardant la partie locale de "
-"la sp챕cification de r챕f챕rence configur챕e pour le distant correspondant et en "
-"enlevant la partie initiale jusqu'au \"*\". Cela indiquerait d'utiliser le "
-"nom 짬혻`hack`혻쨩 comme branche locale cr챕챕e 횪 partir de `origin/hack` (ou `"
-"remotes/origin/hack`, ou m챗me `refs/remotes/origin/hack`). Si le nom fourni "
-"ne contient pas de barre oblique, ou si le r챕sultat de la d챕rivation est un "
-"nom vide, la d챕rivation 챕choue. Vous pouvez sp챕cifier explicitement un nom "
-"avec `-b` dans ce cas."
+msgstr "Si aucune option `-b` n'est fournie, le nom de la nouvelle branche sera d챕riv챕 de la branche de suivi 횪 distance, en regardant la partie locale de la sp챕cification de r챕f챕rence configur챕e pour le distant correspondant et en enlevant la partie initiale jusqu'au \"*\". Cela indiquerait d'utiliser le nom 짬혻`hack`혻쨩 comme branche locale cr챕챕e 횪 partir de `origin/hack` (ou `remotes/origin/hack`, ou m챗me `refs/remotes/origin/hack`). Si le nom fourni ne contient pas de barre oblique, ou si le r챕sultat de la d챕rivation est un nom vide, la d챕rivation 챕choue. Vous pouvez sp챕cifier explicitement un nom avec `-b` dans ce cas."
#. type: Plain text
#: en/git-checkout.txt:175 en/git-switch.txt:170
#, priority:240
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."
+msgstr "Ne pas renseigner la configuration 짬혻amont혻쨩, m챗me si la configuration `branch.autoSetupMerge` est true."
#. type: Labeled list
#: en/git-checkout.txt:176 en/git-switch.txt:87
@@ -11983,10 +11813,7 @@ msgstr "--no-guess"
#: en/git-checkout.txt:181 en/git-switch.txt:92
#, priority:240
msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to"
-msgstr ""
-"Si la `<branche>` n'est pas trouv챕e mais qu'il existe une branche de suivi "
-"pour un d챕p척t distant unique (appel챕 `<distant>`) avec un nom correspondant, "
-"le traiter comme 챕quivalent 횪"
+msgstr "Si la `<branche>` n'est pas trouv챕e mais qu'il existe une branche de suivi pour un d챕p척t distant unique (appel챕 `<distant>`) avec un nom correspondant, le traiter comme 챕quivalent 횪"
#. type: Plain text
#: en/git-checkout.txt:194 en/git-switch.txt:104 en/git-worktree.txt:71
@@ -12016,11 +11843,7 @@ msgstr "--detach"
#: en/git-checkout.txt:207
#, priority:240
msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of `git checkout <commit>` when `<commit>` is not a branch name. See the \"DETACHED HEAD\" section below for details."
-msgstr ""
-"Plut척t que d'extraire une branche pour travailler dessus, extraire un commit "
-"pour l'inspecter et faire des exp챕riences jetables. C'est le comportement "
-"par d챕faut de `git checkout <commit>` quand `<commit>` n'est pas un nom de "
-"branche. Voir la section 짬혻HEAD D횋TACH횋E혻쨩 plus bas pour plus de d챕tails."
+msgstr "Plut척t que d'extraire une branche pour travailler dessus, extraire un commit pour l'inspecter et faire des exp챕riences jetables. C'est le comportement par d챕faut de `git checkout <commit>` quand `<commit>` n'est pas un nom de branche. Voir la section 짬혻HEAD D횋TACH횋E혻쨩 plus bas pour plus de d챕tails."
#. type: Labeled list
#: en/git-checkout.txt:208
@@ -12032,23 +11855,13 @@ msgstr "--orphan <nouvelle_branche>"
#: en/git-checkout.txt:214
#, priority:240
msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
-msgstr ""
-"Cr챕er une nouvelle branche 짬혻orpheline혻쨩, nomm챕e `<nouvelle_branche>`, "
-"commen챌ant depuis `<point_de_d챕part>` et basculer dessus. Le premier commit "
-"r챕alis챕 sur cette branche n'aura pas de parent et il sera la racine du "
-"nouvel historique totalement d챕connect챕 de toutes les autres branches et des "
-"autres commits."
+msgstr "Cr챕er une nouvelle branche 짬혻orpheline혻쨩, nomm챕e `<nouvelle_branche>`, commen챌ant depuis `<point_de_d챕part>` et basculer dessus. Le premier commit r챕alis챕 sur cette branche n'aura pas de parent et il sera la racine du nouvel historique totalement d챕connect챕 de toutes les autres branches et des autres commits."
#. type: Plain text
#: en/git-checkout.txt:219
#, priority:240
msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`. This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit."
-msgstr ""
-"L'index et l'arbre de travail sont ajust챕s comme si vous aviez d챕j횪 lanc챕 `"
-"git혻checkout혻<point_de_d챕part>`. Cela vous permet de d챕marrer un nouvel "
-"historique qui enregistre un ensemble de chemins similaires 횪 "
-"`<point_de_d챕part>` en lan챌ant simplement `git혻commit혻-a` pour cr챕er le "
-"commit racine."
+msgstr "L'index et l'arbre de travail sont ajust챕s comme si vous aviez d챕j횪 lanc챕 `git혻checkout혻<point_de_d챕part>`. Cela vous permet de d챕marrer un nouvel historique qui enregistre un ensemble de chemins similaires 횪 `<point_de_d챕part>` en lan챌ant simplement `git혻commit혻-a` pour cr챕er le commit racine."
#. type: Plain text
#: en/git-checkout.txt:225
@@ -12060,14 +11873,7 @@ msgstr "Ceci peut 챗tre utile quand vous souhaitez publier un arbre depuis un co
#: en/git-checkout.txt:232
#, priority:240
msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
-msgstr ""
-"Si vous voulez d챕marrer un historique d챕connect챕 qui enregistre un ensemble "
-"de chemins qui sont totalement diff챕rents de celui de `<point_de_d챕part>`, "
-"vous devriez effacer l'index et l'arbre de travail juste apr챔s avoir cr챕챕 la "
-"branche orpheline en lan챌ant `git혻rm혻-rf혻.` depuis la racine de l'arbre de "
-"travail. Apr챔s, vous pourrez pr챕parer vos nouveaux fichiers, pour repeupler "
-"l'arbre de travail, en les copiant depuis un autre endroit, en les extrayant "
-"depuis une archive, etc."
+msgstr "Si vous voulez d챕marrer un historique d챕connect챕 qui enregistre un ensemble de chemins qui sont totalement diff챕rents de celui de `<point_de_d챕part>`, vous devriez effacer l'index et l'arbre de travail juste apr챔s avoir cr챕챕 la branche orpheline en lan챌ant `git혻rm혻-rf혻.` depuis la racine de l'arbre de travail. Apr챔s, vous pourrez pr챕parer vos nouveaux fichiers, pour repeupler l'arbre de travail, en les copiant depuis un autre endroit, en les extrayant depuis une archive, etc."
#. type: Labeled list
#: en/git-checkout.txt:233 en/git-restore.txt:103
@@ -12079,14 +11885,10 @@ msgstr "--ignore-skip-worktree-bits"
#: en/git-checkout.txt:238
#, priority:240
msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by `<paths>` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in `<paths>`."
-msgstr ""
-"En mode d'extraction clairsem챕, `git혻checkout혻--혻<chemins>` mettrait "
-"seulement 횪 jour les entr챕es correspondant 횪 `<chemins>` et aux motifs "
-"clairsem챕s dans `$GIT_DIR/info/sparse-checkout`. Cette option ignore les "
-"motifs clairsem챕s et r챕-ajoute tous les fichiers de `<chemins>`."
+msgstr "En mode d'extraction clairsem챕, `git혻checkout혻--혻<chemins>` mettrait seulement 횪 jour les entr챕es correspondant 횪 `<chemins>` et aux motifs clairsem챕s dans `$GIT_DIR/info/sparse-checkout`. Cette option ignore les motifs clairsem챕s et r챕-ajoute tous les fichiers de `<chemins>`."
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -12125,22 +11927,13 @@ msgstr "--conflict=<style>"
#: en/git-checkout.txt:266 en/git-restore.txt:96 en/git-switch.txt:139
#, priority:240
msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
-msgstr ""
-"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)."
+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)."
#. type: Plain text
#: en/git-checkout.txt:273
#, priority:240
msgid "Interactively select hunks in the difference between the `<tree-ish>` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `<tree-ish>` was specified, the index)."
-msgstr ""
-"S챕lectionner interactivement les sections dans la diff챕rence entre l'`<arbre-"
-"esque>` (ou l'index, si non sp챕cifi챕) et l'arbre de travail. Les sections "
-"choisies sont ensuite appliqu챕es en ordre invers챕 횪 l'arbre de travail (et "
-"si un `<arbre-esque>` a 챕t챕 sp챕cifi챕, 횪 l'index)."
+msgstr "S챕lectionner interactivement les sections dans la diff챕rence entre l'`<arbre-esque>` (ou l'index, si non sp챕cifi챕) et l'arbre de travail. Les sections choisies sont ensuite appliqu챕es en ordre invers챕 횪 l'arbre de travail (et si un `<arbre-esque>` a 챕t챕 sp챕cifi챕, 횪 l'index)."
#. type: Plain text
#: en/git-checkout.txt:277
@@ -12194,14 +11987,7 @@ msgstr "--recurse-submodules"
#: en/git-checkout.txt:302
#, priority:240
msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
-msgstr ""
-"L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu "
-"de tous les sous-modules initialis챕s en fonction du commit enregistr챕 dans "
-"le super-projet. Si des modifications locales au sous-modules seraient "
-"챕cras챕es, l'extraction 챕choue 횪 moins d'utiliser `-f`. Si l'option n'est pas "
-"sp챕cifi챕e (ou si `--no-recurse-submodules` est sp챕cifi챕), les arbres de "
-"travail des sous-modules ne sont pas mis 횪 jour. Comme linkgit:git-"
-"submodule[1], la `HEAD` des sous-modules sera d챕tach챕e."
+msgstr "L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu de tous les sous-modules initialis챕s en fonction du commit enregistr챕 dans le super-projet. Si des modifications locales au sous-modules seraient 챕cras챕es, l'extraction 챕choue 횪 moins d'utiliser `-f`. Si l'option n'est pas sp챕cifi챕e (ou si `--no-recurse-submodules` est sp챕cifi챕), les arbres de travail des sous-modules ne sont pas mis 횪 jour. Comme linkgit:git-submodule[1], la `HEAD` des sous-modules sera d챕tach챕e."
#. type: Labeled list
#: en/git-checkout.txt:303 en/git-restore.txt:110
@@ -12231,31 +12017,19 @@ msgstr "<branche>"
#: en/git-checkout.txt:330
#, priority:240
msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)."
-msgstr ""
-"Branche 횪 extraire혻; si c'est une r챕f챕rence 횪 une branche (c'est-횪-dire un "
-"nom qui, pr챕fix챕 par 짬혻refs/heads/혻쨩 est une r챕f챕rence valide), alors cette "
-"branche est extraite. Sinon, si c'est une r챕f챕rence 횪 un commit valide, "
-"votre `HEAD` devient 짬혻d챕tach챕e혻쨩 et vous n'챗tes plus sur aucune branche ("
-"voir plus bas pour plus de d챕tails)."
+msgstr "Branche 횪 extraire혻; si c'est une r챕f챕rence 횪 une branche (c'est-횪-dire un nom qui, pr챕fix챕 par 짬혻refs/heads/혻쨩 est une r챕f챕rence valide), alors cette branche est extraite. Sinon, si c'est une r챕f챕rence 횪 un commit valide, votre `HEAD` devient 짬혻d챕tach챕e혻쨩 et vous n'챗tes plus sur aucune branche (voir plus bas pour plus de d챕tails)."
#. type: Plain text
#: en/git-checkout.txt:334
#, priority:240
msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`."
-msgstr ""
-"Vous pouvez utiliser la syntaxe `@{-N}` pour faire r챕f챕rence 횪 la N-i챔me "
-"derni챔re branche ou commit extrait en utilisant une op챕ration 짬혻git checkout혻"
-"쨩. Vous pouvez aussi sp챕cifier `-` qui est synonyme de `@{-1}`."
+msgstr "Vous pouvez utiliser la syntaxe `@{-N}` pour faire r챕f챕rence 횪 la N-i챔me derni챔re branche ou commit extrait en utilisant une op챕ration 짬혻git checkout혻쨩. Vous pouvez aussi sp챕cifier `-` qui est synonyme de `@{-1}`."
#. type: Plain text
#: en/git-checkout.txt:338 en/git-switch.txt:58
#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
-msgstr ""
-"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."
+msgstr "Autre cas sp챕cial suppl챕mentaire, vous pouvez utiliser `A...B` comme raccourci pour la base de fusion de `A` et `B` s'il y a exactement une seule base de fusion. Vous pouvez ne pas sp챕cifier `A` ou `B`, auquel cas ce sera `HEAD` par d챕faut."
#. type: Labeled list
#: en/git-checkout.txt:339
@@ -12279,9 +12053,7 @@ msgstr "<point_de_d챕part>"
#: en/git-checkout.txt:345
#, priority:240
msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`."
-msgstr ""
-"Le nom du commit auquel d챕marrer la nouvelle branche혻; voir linkgit:git-"
-"branch[1] pour plus de d챕tails. `HEAD` par d챕faut."
+msgstr "Le nom du commit auquel d챕marrer la nouvelle branche혻; voir linkgit:git-branch[1] pour plus de d챕tails. `HEAD` par d챕faut."
#. type: Plain text
#: en/git-checkout.txt:349
@@ -12302,7 +12074,7 @@ msgid "Limits the paths affected by the operation."
msgstr "Limite les chemins affect챕s par l'op챕ration."
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "Pour plus de d챕tail, voir l'entr챕e 'sp챕cificateur de chemin' dans linkgit:gitglossary[7]."
@@ -12317,11 +12089,7 @@ msgstr "HEAD D횋TACH횋E"
#: en/git-checkout.txt:367
#, priority:240
msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:"
-msgstr ""
-"`HEAD` fait normalement r챕f챕rence 횪 une branche nomm챕e (par exemple, "
-"`master`). Dans le m챗me temps, chaque branche pointe sur un commit "
-"sp챕cifique. Regardons un d챕p척t avec trois commits, dont un est 챕tiquet챕, et "
-"avec la branche `master` extraite혻:"
+msgstr "`HEAD` fait normalement r챕f챕rence 횪 une branche nomm챕e (par exemple, `master`). Dans le m챗me temps, chaque branche pointe sur un commit sp챕cifique. Regardons un d챕p척t avec trois commits, dont un est 챕tiquet챕, et avec la branche `master` extraite혻:"
#. type: delimited block -
#: en/git-checkout.txt:376
@@ -12347,13 +12115,7 @@ msgstr ""
#: en/git-checkout.txt:383
#, priority:240
msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:"
-msgstr ""
-"Quand un commit est cr챕챕 dans cet 챕tat, la branche est mise 횪 jour pour "
-"faire r챕f챕rence au nouveau commit. Plus pr챕cis챕ment, 'git commit' cr챕e un "
-"nouveau commit `d`, dont le parent est le commit `c`, et ainsi elle met 횪 "
-"jour la branche `master` pour faire r챕f챕rence au nouveau commit `d`. `HEAD` "
-"fait toujours r챕f챕rence 횪 la branche `master` et donc fait maintenant "
-"r챕f챕rence indirectement au commit `d`혻:"
+msgstr "Quand un commit est cr챕챕 dans cet 챕tat, la branche est mise 횪 jour pour faire r챕f챕rence au nouveau commit. Plus pr챕cis챕ment, 'git commit' cr챕e un nouveau commit `d`, dont le parent est le commit `c`, et ainsi elle met 횪 jour la branche `master` pour faire r챕f챕rence au nouveau commit `d`. `HEAD` fait toujours r챕f챕rence 횪 la branche `master` et donc fait maintenant r챕f챕rence indirectement au commit `d`혻:"
#. type: delimited block -
#: en/git-checkout.txt:386 en/git-checkout.txt:421 en/git-checkout.txt:438
@@ -12385,11 +12147,7 @@ msgstr ""
#: en/git-checkout.txt:400
#, priority:240
msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit `b` (here we show two ways this may be done):"
-msgstr ""
-"Il est parfois utile de permettre l'extraction d'un commit qui n'est sommet "
-"d'aucune branche ou m챗me de cr챕er un nouveau commit qui n'est pas r챕f챕renc챕 "
-"par une branche nomm챕e. Regardons ce qui arrive quand on extrait le commit "
-"`b` (ici, deux mani챔res de faire sont montr챕es)혻:"
+msgstr "Il est parfois utile de permettre l'extraction d'un commit qui n'est sommet d'aucune branche ou m챗me de cr챕er un nouveau commit qui n'est pas r챕f챕renc챕 par une branche nomm챕e. Regardons ce qui arrive quand on extrait le commit `b` (ici, deux mani챔res de faire sont montr챕es)혻:"
#. type: delimited block -
#: en/git-checkout.txt:404
@@ -12425,12 +12183,7 @@ msgstr ""
#: en/git-checkout.txt:418
#, priority:240
msgid "Notice that regardless of which checkout command we use, `HEAD` now refers directly to commit `b`. This is known as being in detached `HEAD` state. It means simply that `HEAD` refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
-msgstr ""
-"Veuillez noter que quelle que soit la commande d'extraction utilis챕e, `HEAD` "
-"pointe maintenant directement sur le commit `b`. C'est connu comme 챕tant "
-"l'챕tat `HEAD` d챕tach챕e. Ceci signifie simplement que `HEAD` fait r챕f챕rence 횪 "
-"un commit sp챕cifique, par opposition 횪 une r챕f챕rence 횪 une branche nomm챕e. "
-"Voyons ce qui arrive quand un commit est cr챕챕혻:"
+msgstr "Veuillez noter que quelle que soit la commande d'extraction utilis챕e, `HEAD` pointe maintenant directement sur le commit `b`. C'est connu comme 챕tant l'챕tat `HEAD` d챕tach챕e. Ceci signifie simplement que `HEAD` fait r챕f챕rence 횪 un commit sp챕cifique, par opposition 횪 une r챕f챕rence 횪 une branche nomm챕e. Voyons ce qui arrive quand un commit est cr챕챕혻:"
#. type: delimited block -
#: en/git-checkout.txt:431
@@ -12460,9 +12213,7 @@ msgstr ""
#: en/git-checkout.txt:435
#, priority:240
msgid "There is now a new commit `e`, but it is referenced only by `HEAD`. We can of course add yet another commit in this state:"
-msgstr ""
-"Il y a maintenant un nouveau commit `e` mais il est r챕f챕renc챕 seulement par "
-"`HEAD`. Un autre commit peut bien s청r 챗tre ajout챕 dans cet 챕tat혻:"
+msgstr "Il y a maintenant un nouveau commit `e` mais il est r챕f챕renc챕 seulement par `HEAD`. Un autre commit peut bien s청r 챗tre ajout챕 dans cet 챕tat혻:"
#. type: delimited block -
#: en/git-checkout.txt:448
@@ -12492,9 +12243,7 @@ msgstr ""
#: en/git-checkout.txt:452
#, priority:240
msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout `master`:"
-msgstr ""
-"En fait, toutes les op챕rations normales de Git peuvent 챗tre ex챕cut챕es. Mais, "
-"regardons ce qui arrive quand `master` est extraite :"
+msgstr "En fait, toutes les op챕rations normales de Git peuvent 챗tre ex챕cut챕es. Mais, regardons ce qui arrive quand `master` est extraite :"
#. type: delimited block -
#: en/git-checkout.txt:455
@@ -12526,13 +12275,7 @@ msgstr ""
#: en/git-checkout.txt:470
#, priority:240
msgid "It is important to realize that at this point nothing refers to commit `f`. Eventually commit `f` (and by extension commit `e`) will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit `f`, any of these will create a reference to it:"
-msgstr ""
-"Il est important de r챕aliser qu'횪 ce moment, rien ne fait r챕f챕rence au "
-"commit `f`. Finalement, le commit `f` (et par extension le commit `e`) sera "
-"supprim챕 par le processus de ramasse-miette r챕gulier de Git, 횪 moins de "
-"cr챕er une r챕f챕rence avant que cela n'arrive. Si vous n'avez pas encore "
-"quitt챕 le commit `f`, une des commandes suivantes permet de cr챕er une "
-"r챕f챕rence sur lui혻:"
+msgstr "Il est important de r챕aliser qu'횪 ce moment, rien ne fait r챕f챕rence au commit `f`. Finalement, le commit `f` (et par extension le commit `e`) sera supprim챕 par le processus de ramasse-miette r챕gulier de Git, 횪 moins de cr챕er une r챕f챕rence avant que cela n'arrive. Si vous n'avez pas encore quitt챕 le commit `f`, une des commandes suivantes permet de cr챕er une r챕f챕rence sur lui혻:"
#. type: delimited block -
#: en/git-checkout.txt:475
@@ -12550,37 +12293,25 @@ msgstr ""
#: en/git-checkout.txt:480
#, priority:240
msgid "creates a new branch `foo`, which refers to commit `f`, and then updates `HEAD` to refer to branch `foo`. In other words, we'll no longer be in detached `HEAD` state after this command."
-msgstr ""
-"cr챕e une nouvelle branche `foo` qui fait r챕f챕rence au commit `f`, puis met 횪 "
-"jour `HEAD` pour faire r챕f챕rence 횪 la branche `foo`. En d'autres termes, "
-"l'챕tat ne sera plus en `HEAD` d챕tach챕e apr챔s cette commande."
+msgstr "cr챕e une nouvelle branche `foo` qui fait r챕f챕rence au commit `f`, puis met 횪 jour `HEAD` pour faire r챕f챕rence 횪 la branche `foo`. En d'autres termes, l'챕tat ne sera plus en `HEAD` d챕tach챕e apr챔s cette commande."
#. type: Plain text
#: en/git-checkout.txt:483
#, priority:240
msgid "similarly creates a new branch `foo`, which refers to commit `f`, but leaves `HEAD` detached."
-msgstr ""
-"cr챕e aussi une nouvelle branche `foo` qui fait r챕f챕rence au commit `f` mais "
-"laisse `HEAD` d챕tach챕e."
+msgstr "cr챕e aussi une nouvelle branche `foo` qui fait r챕f챕rence au commit `f` mais laisse `HEAD` d챕tach챕e."
#. type: Plain text
#: en/git-checkout.txt:486
#, priority:240
msgid "creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` detached."
-msgstr ""
-"cr챕e une nouvelle 챕tiquette `foo` qui fait r챕f챕rence au commit `f`, en "
-"laissant `HEAD` d챕tach챕e."
+msgstr "cr챕e une nouvelle 챕tiquette `foo` qui fait r챕f챕rence au commit `f`, en laissant `HEAD` d챕tach챕e."
#. type: Plain text
#: en/git-checkout.txt:491
#, priority:240
msgid "If we have moved away from commit `f`, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which `HEAD` referred, we can use either of these commands:"
-msgstr ""
-"Si nous ne sommes plus sur `f`, alors nous devons d'abord retrouver son nom "
-"d'objet (typiquement en utilisant git reflog), puis nous pouvons cr챕er une "
-"r챕f챕rence dessus. Par exemple, pour voir les deux derniers commits sur "
-"lesquels `HEAD` pointait, nous pouvons utiliser l'une des commandes "
-"suivantes혻:"
+msgstr "Si nous ne sommes plus sur `f`, alors nous devons d'abord retrouver son nom d'objet (typiquement en utilisant git reflog), puis nous pouvons cr챕er une r챕f챕rence dessus. Par exemple, pour voir les deux derniers commits sur lesquels `HEAD` pointait, nous pouvons utiliser l'une des commandes suivantes혻:"
#. type: delimited block -
#: en/git-checkout.txt:495
@@ -12602,25 +12333,13 @@ msgstr "D횋SAMBIGU횕SATION D'ARGUMENT"
#: en/git-checkout.txt:508
#, priority:240
msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `<tree-ish>` (e.g. a branch `abc` exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
-msgstr ""
-"Quand il n'y a qu'un argument fourni et qu'il n'est pas `--` (par exemple `"
-"git checkout abc`) et quand l'argument est 횪 la fois un `<arbre-esque>` "
-"valide (par exemple une branche `abc` existe) et un <sp챕cificateur_de_chemin>"
-" valide (par exemple un fichier ou un r챕pertoire du nom de 짬혻abc혻쨩 existe), "
-"Git vous demandera g챕n챕ralement de lever l'ambigu챦t챕. Du fait qu'extraire "
-"une branche est une op챕ration tr챔s commune, cependant, `git checkout abc` "
-"consid챔re 짬혻abc혻쨩 comme un <arbre-esque> dans une telle situation. Utilisez `"
-"git checkout -- <sp챕cificateur_de_chemin>` si vous voulez extraire ces "
-"chemins depuis l'index."
+msgstr "Quand il n'y a qu'un argument fourni et qu'il n'est pas `--` (par exemple `git checkout abc`) et quand l'argument est 횪 la fois un `<arbre-esque>` valide (par exemple une branche `abc` existe) et un <sp챕cificateur_de_chemin> valide (par exemple un fichier ou un r챕pertoire du nom de 짬혻abc혻쨩 existe), Git vous demandera g챕n챕ralement de lever l'ambigu챦t챕. Du fait qu'extraire une branche est une op챕ration tr챔s commune, cependant, `git checkout abc` consid챔re 짬혻abc혻쨩 comme un <arbre-esque> dans une telle situation. Utilisez `git checkout -- <sp챕cificateur_de_chemin>` si vous voulez extraire ces chemins depuis l'index."
#. type: Plain text
#: en/git-checkout.txt:515
#, priority:240
msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes `hello.c` by mistake, and gets it back from the index."
-msgstr ""
-"La s챕quence suivante extrait 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."
+msgstr "La s챕quence suivante extrait 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-checkout.txt:521
@@ -12700,10 +12419,7 @@ msgstr "$ git checkout monsujet\n"
#: en/git-checkout.txt:557
#, priority:240
msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
-msgstr ""
-"Cependant, votre 짬혻fausse혻쨩 branche et votre branche correcte `monsujet` "
-"peuvent 챗tre diff챕rentes par les fichiers que vous avez modifi챕s localement, "
-"auquel cas l'extraction ci-dessus 챕chouerait comme ceci혻:"
+msgstr "Cependant, votre 짬혻fausse혻쨩 branche et votre branche correcte `monsujet` peuvent 챗tre diff챕rentes par les fichiers que vous avez modifi챕s localement, auquel cas l'extraction ci-dessus 챕chouerait comme ceci혻:"
#. type: delimited block -
#: en/git-checkout.txt:561
@@ -13161,7 +12877,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -13185,7 +12901,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -13411,7 +13127,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr "<t챗te>"
@@ -13609,9 +13325,7 @@ msgstr "git-clean - Supprime les fichiers non suivis de l'arbre de travail"
#: en/git-clean.txt:12
#, ignore-ellipsis, no-wrap, priority:100
msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
-msgstr ""
-"'git clean' [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
-"\n"
+msgstr "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>...\n"
#. type: Plain text
#: en/git-clean.txt:18
@@ -14002,7 +13716,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr "Aucune extraction de HEAD n'est effectu챕e apr챔s la fin du clonage."
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -14146,7 +13860,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr "Cr챕er un clone superficiel avec un historique, en excluant les commits joignables depuis une branche distante sp챕cifi챕e ou une 챕tiquette. Cette option peut 챗tre sp챕cifi챕e plusieurs fois."
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -14242,7 +13956,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr "Le nombre de sous-modules r챕cup챕r챕s en m챗me temps. Par d챕faut, l'option `submodule.fetchJobs`."
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr "<d챕p척t>"
@@ -14550,7 +14264,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr "<arbre>"
@@ -14595,10 +14309,7 @@ msgstr "-F <fichier>"
#: en/git-commit-tree.txt:61
#, priority:100
msgid "Read the commit log message from the given file. Use `-` to read from the standard input. This can be given more than once and the content of each file becomes its own paragraph."
-msgstr ""
-"Lire le message de validation depuis le fichier indiqu챕. Utilisez '-' pour "
-"lire le message depuis l'entr챕e standard. Ceci peut 챗tre indiqu챕 plusieurs "
-"fois et le contenu de chaque fichier devient un paragraphe diff챕rent."
+msgstr "Lire le message de validation depuis le fichier indiqu챕. Utilisez '-' pour lire le message depuis l'entr챕e standard. Ceci peut 챗tre indiqu챕 plusieurs fois et le contenu de chaque fichier devient un paragraphe diff챕rent."
#. type: Labeled list
#: en/git-commit-tree.txt:68 en/git-commit.txt:355
@@ -14613,89 +14324,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr "Information de validation"
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr "FICHIERS"
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14909,7 +14596,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr "Avec '--dry-run', donner la sortie en format long. Implique `--dry-run`."
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -15005,7 +14692,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr "Ajouter une ligne Signed-off-by du validateur 횪 la fin du message de validation. La signification de signoff d챕pend du projet, mais ceci certifie typiquement que le validateur a les droits de soumettre son travail sous la m챗me licence et accepte un Certificat d'Origine de D챕veloppeur (voir http://developercertificate.org/ pour plus d'information)."
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -15311,13 +14998,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr "Quand un sp챕cifcateur de chemins est fourni sur la ligne de commande, valider le contenu des fichiers correspondants, sans enregistrer les modifications d챕j횪 index챕es. Le contenu de ces fichiers est aussi index챕 pour le commit suivant par-dessus ce qui a 챕t챕 index챕 auparavant."
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr "Lors de l'enregistrement de votre propre travail, le contenu des fichiers modifi챕s dans votre arbre de travail est temporairement stock챕 au moyen de `git add` dans une zone de stockage interm챕diaire appel챕e 짬혻l'index혻쨩. Un fichier peut n'챗tre ramen챕 횪 son contenu correspondant au dernier commit seulement dans l'index mais pas dans l'arbre de travail gr창ce 횪 `git restore --staged <fichier>`, ce qui inverse effectivement le 'git add' et emp챗che les modifications de ce fichier de participer 횪 la prochaine validation. Apr챔s avoir construit l'챕tat 횪 valider de mani챔re incr챕mentale avec ces commandes, `git commit` (sans aucun nom de chemin en param챔tre) sert 횪 enregistrer ce qui a 챕t챕 pr챕par챕 jusqu'ici. C'est la forme la plus simple de la commande. Par exemple혻:"
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -15331,13 +15018,13 @@ msgstr ""
"$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr "Au lieu d'indexer les fichiers apr챔s chaque modification individuelle, vous pouvez ordonner 횪 `git commit` d'inspecter les modifications des fichiers dont le contenu est d챕j횪 suivi dans votre arbre de travail et de r챕aliser les `git add` et `git rm` correspondant pour vous. De fait, l'exemple suivant fait la m챗me chose que l'exemple pr챕c챕dent si aucune autre modification n'a eu lieu dans votre arbre de travail혻:"
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -15349,19 +15036,19 @@ msgstr ""
"$ git commit -a\n"
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr "La commande `git commit -a` inspecte votre arbre de travail, remarque que vous avez modifi챕 hello.c et supprim챕 goodbye.c, puis r챕alise les `git add` et `git rm` n챕cessaires pour vous."
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr "Apr챔s l'indexation des modifications de nombreux fichiers, vous pouvez modifier l'ordre dans lequel les modifications sont enregistr챕es, en fournissant des chemins 횪 `git commit`. Quand ces chemins sont fournis, la commande cr챕e un commit qui n'enregistre que les modifications des chemins indiqu챕s혻:"
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -15375,31 +15062,31 @@ msgstr ""
"$ git commit Makefile\n"
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr "Ceci cr챕e un commit qui enregistre les modifications de `Makefile`. Les modifications index챕es pour `hello.c` et `hello.h` ne sont pas incluses dans le commit r챕sultant. Cependant, leurs modifications ne sont pas perdues -- elles sont toujours index챕es et simplement suspendues. Apr챔s la s챕quence ci-dessus, si vous faites혻:"
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr "$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr "cette seconde validation enregistrerait les modifications de `hello.c` et `hello.h` comme attendu."
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr "Apr챔s l'arr챗t d'une fusion (commenc챕e avec `git merge` ou `git pull`) pour cause de conflit, les chemins fusionn챕s proprement sont d챕j횪 index챕s pour vous, et les chemins en conflit sont laiss챕s dans un 챕tat non-fusionn챕. Vous auriez 횪 chercher d'abord les chemins en conflit avec `git status` et apr챔s les avoir corrig챕s manuellement dans votre copie de travail, vous les indexeriez comme d'habitude avec `git add`혻:"
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -15413,55 +15100,110 @@ msgstr ""
"$ git add hello.c\n"
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr "Apr챔s avoir r챕solu les conflits et index챕 le r챕sultat, `git ls-files -u` arr챗terait de mentionner les chemins en conflit. Quand vous avez termin챕, lancez `git commit` pour finaliser la validation de la fusion혻:"
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr "Comme dans le cas de la validation de vos propres modifications, vous pouvez utiliser l'option `-a` pour vous 챕pargner de la frappe. Une diff챕rence est que pendant la r챕solution de fusion, vous ne pouvez pas utiliser `git commit` avec des noms de chemin pour changer l'ordre des modifications 횪 valider, parce que la fusion doit 챗tre enregistr챕e comme un commit unique. En fait, la commande refuse d'챗tre lanc챕e avec des noms de chemin (voir par contre l'option `-i`)."
+#. type: Title -
+#: en/git-commit.txt:464
+#, fuzzy, no-wrap, priority:280
+#| msgid "BASE TREE INFORMATION"
+msgid "COMMIT INFORMATION"
+msgstr "INFORMATION D'ARBRE DE BASE"
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr "Bien que 챌a ne soit pas requis, c'est une bonne pratique de commencer les messages de validation avec une seule ligne courte (moins de 50 caract챔res) pour r챕sumer la modification, suivie d'une ligne blanche, suivie d'un description plus pr챕cise. Le texte jusqu'횪 la ligne vide du message de validation est trait챕 comme le titre du commit, et ce titre est utilis챕 extensivement dans Git. Par exemple, linkgit:git-format-patch[1] transforme un commit en courriel et utilise le titre comme sujet et le reste du texte comme corps."
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr "L'챕diteur utilis챕 pour 챕diter le message de validation sera choisi dans l'ordre de recherche depuis la variable d'environnement `GIT_EDITOR`, puis depuis la variable de configuration `core.editor`, puis depuis la variable d'environnement `VISUAL` ou la variable d'environnement `EDITOR`. Voir linkgit:git-var[1] pour plus de d챕tails."
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr "Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` et `post-rewrite`. Voir linkgit:githooks[5] pour de plus amples informations."
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr "Ce fichier contient le message de validation en cours. Si `git commit` sort 횪 cause d'une erreur avant de cr챕er un commit, tout message de validation fourni par l'utilisateur (par exemple dans une session d'챕diteur) sera disponible dans ce fichier, mais sera 챕cras챕 par l'invocation suivante de `git commit`."
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15482,18 +15224,18 @@ msgstr "git-config - Lire et 챕crire les options du d챕p척t et les options globa
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15674,7 +15416,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15933,204 +15675,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr "--default <valeur>"
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr "~/.gitconfig"
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr "Fichier de configuration sp챕cifique au d챕p척t."
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -16141,7 +15895,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -16155,7 +15909,7 @@ msgstr ""
"\tfilemode = false\n"
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -16165,7 +15919,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -16175,7 +15929,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -16187,157 +15941,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -16347,13 +16101,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16366,19 +16120,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr "BOGUES"
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16386,13 +16140,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16479,7 +16233,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19789,9 +19543,7 @@ msgstr "git-diff-tree(1)"
#: en/git-diff-tree.txt:7
#, priority:100
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
-msgstr ""
-"git-diff-tree - Compare le contenu et la mode des blobs trouv챕s via deux "
-"objets arbre"
+msgstr "git-diff-tree - Compare le contenu et la mode des blobs trouv챕s via deux objets arbre"
#. type: Plain text
#: en/git-diff-tree.txt:15
@@ -19827,7 +19579,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr "<chemin>..."
@@ -23117,7 +22869,7 @@ msgid "The URL to the remote repository."
msgstr "L'URL du d챕p척t distant."
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -23506,7 +23258,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -24265,7 +24017,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24884,7 +24636,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr "HEAD"
@@ -25356,10 +25108,7 @@ msgstr ""
#: en/git-format-patch.txt:124
#, priority:100
msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
-msgstr ""
-"Ajouter une ligne `Signed-off-by:` au message de commit, en utilisant votre "
-"identit챕 pour validateur. R챕f챕rez-vous 횪 l'option signoff dans linkgit:git-"
-"commit[1] pour plus d'information."
+msgstr "Ajouter une ligne `Signed-off-by:` au message de commit, en utilisant votre identit챕 pour validateur. R챕f챕rez-vous 횪 l'option signoff dans linkgit:git-commit[1] pour plus d'information."
#. type: Labeled list
#: en/git-format-patch.txt:125 en/git-pack-objects.txt:59
@@ -26553,11 +26302,7 @@ msgstr ""
#: en/git-fsck.txt:106
#, priority:100
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --no-progress or --verbose is specified. --progress forces progress status even if the standard error stream is not directed to a terminal."
-msgstr ""
-"L'챕tat d'avancement est affich챕 sur la sortie d'erreur standard quand elle "
-"est attach챕e 횪 un terminal, 횪 moins que --no-progress ou --verbose soit "
-"sp챕cifi챕. --no-progress force l'챕tat d'avancement m챗me si le flux d'erreur "
-"standard n'est pas dirig챕 vers un terminal."
+msgstr "L'챕tat d'avancement est affich챕 sur la sortie d'erreur standard quand elle est attach챕e 횪 un terminal, 횪 moins que --no-progress ou --verbose soit sp챕cifi챕. --no-progress force l'챕tat d'avancement m챗me si le flux d'erreur standard n'est pas dirig챕 vers un terminal."
#. type: Plain text
#: en/git-fsck.txt:121
@@ -26656,7 +26401,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr "Variables d'environnement"
@@ -26707,8 +26452,7 @@ msgstr "git-gc(1)"
#: en/git-gc.txt:7
#, priority:100
msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
-msgstr ""
-"git-gc - Efface les fichiers non-n챕cessaires et optimiser le d챕p척t local"
+msgstr "git-gc - Efface les fichiers non-n챕cessaires et optimiser le d챕p척t local"
#. type: Plain text
#: en/git-gc.txt:13
@@ -27027,7 +26771,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -27076,9 +26820,7 @@ msgstr "--untracked"
#: en/git-grep.txt:85
#, priority:100
msgid "In addition to searching in the tracked files in the working tree, search also in untracked files."
-msgstr ""
-"En plus de rechercher dans les fichiers suivis dans l'arbre de travail, "
-"rechercher aussi dans les fichiers non-suivis."
+msgstr "En plus de rechercher dans les fichiers suivis dans l'arbre de travail, rechercher aussi dans les fichiers non-suivis."
#. type: Labeled list
#: en/git-grep.txt:86
@@ -27105,576 +26847,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr "Ne pas chercher les motifs dans les fichiers binaires."
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr "--max-depth <profondeur>"
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr "-E"
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr "La prise en charge de ces types d'expressions r챕guli챔res est une d챕pendance optionnelle 횪 la compilation. Si Git n'a pas 챕t챕 compil챕 avec ce support et que cette option est activ챕e, la commande se termine imm챕diatement."
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr "-F"
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
-msgstr ""
-"Imprimer une ligne vide entre les correspondances de fichiers diff챕rents."
+msgstr "Imprimer une ligne vide entre les correspondances de fichiers diff챕rents."
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr "-<num>"
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr "-C <num>"
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr "--context <num>"
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr "-A <num>"
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr "--after-context <num>"
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr "-B <num>"
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr "--before-context <num>"
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr "--threads <num>"
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr "-f <fichier>"
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr "Au lieu de rechercher les fichiers suivis dans l'arbre de travail, rechercher les blobs enregistr챕s dans les arbres fournis."
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr "Recherche `time_t` dans tous les fichiers suivis `.c` et `.h` dans le r챕pertoire de travail et ses sous-r챕pertoires."
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr "`git grep solution -- :^Documentation`"
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27712,7 +27471,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -27907,9 +27666,7 @@ msgstr "git-hash-object(1)"
#: en/git-hash-object.txt:7
#, priority:100
msgid "git-hash-object - Compute object ID and optionally creates a blob from a file"
-msgstr ""
-"git-hash - Calculer l'ID d'objet et cr챕er optionnellement un blob depuis un "
-"fichier"
+msgstr "git-hash - Calculer l'ID d'objet et cr챕er optionnellement un blob depuis un fichier"
#. type: Plain text
#: en/git-hash-object.txt:14
@@ -29037,9 +28794,7 @@ msgstr "git-imap-send(1)"
#: en/git-imap-send.txt:7
#, priority:100
msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
-"git-imap - Envoye un ensemble de rustines depuis stdin vers un r챕pertoire "
-"IMAP"
+msgstr "git-imap - Envoye un ensemble de rustines depuis stdin vers un r챕pertoire IMAP"
#. type: Plain text
#: en/git-imap-send.txt:13
@@ -29231,9 +28986,7 @@ msgstr "git-index-pack(1)"
#: en/git-index-pack.txt:7
#, priority:100
msgid "git-index-pack - Build pack index file for an existing packed archive"
-msgstr ""
-"git-index-pack - Construit un fichier d'index pack depuis une archive "
-"compact챕e existante"
+msgstr "git-index-pack - Construit un fichier d'index pack depuis une archive compact챕e existante"
#. type: Plain text
#: en/git-index-pack.txt:15
@@ -29670,8 +29423,7 @@ msgstr "git-instaweb(1)"
#: en/git-instaweb.txt:7
#, priority:100
msgid "git-instaweb - Instantly browse your working repository in gitweb"
-msgstr ""
-"git-instaweb - Navigue instantan챕ment votre d챕p척t de travail dans gitweb"
+msgstr "git-instaweb - Navigue instantan챕ment votre d챕p척t de travail dans gitweb"
#. type: Plain text
#: en/git-instaweb.txt:14
@@ -29830,9 +29582,7 @@ msgstr "git-interpret-trailers(1)"
#: en/git-interpret-trailers.txt:7
#, priority:100
msgid "git-interpret-trailers - Add or parse structured information in commit messages"
-msgstr ""
-"git-interpret-trailers - Ajoute ou analyse de l'information structur챕e dans "
-"les messages de validation"
+msgstr "git-interpret-trailers - Ajoute ou analyse de l'information structur챕e dans les messages de validation"
#. type: Plain text
#: en/git-interpret-trailers.txt:13
@@ -31242,7 +30992,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr "autre"
@@ -31308,7 +31058,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr "<fichier>"
@@ -31420,8 +31170,7 @@ msgid ""
"\t [--symref] [<repository> [<refs>...]]\n"
msgstr ""
"'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url] [--sort=<cl챕>}"
-"\n"
+" [-q | --quiet] [--exit-code] [--get-url] [--sort=<cl챕>}\n"
" [--symref] [<d챕p척t> [<r챕f챕rences>...]]\n"
#. type: Plain text
@@ -31437,97 +31186,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr "--upload-pack=<exec>"
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -31548,7 +31297,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31704,9 +31453,7 @@ msgstr "git-mailinfo(1)"
#: en/git-mailinfo.txt:7
#, priority:100
msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
-msgstr ""
-"git-mailinfo - Extrait la rustine et l'information de d'auteur depuis un "
-"simple message de courriel"
+msgstr "git-mailinfo - Extrait la rustine et l'information de d'auteur depuis un simple message de courriel"
#. type: Plain text
#: en/git-mailinfo.txt:13
@@ -31978,8 +31725,7 @@ msgstr "git-merge-base(1)"
#: en/git-merge-base.txt:7
#, priority:100
msgid "git-merge-base - Find as good common ancestors as possible for a merge"
-msgstr ""
-"git-merge-base - Trouve un anc챗tre aussi bon que possible pour une fusion"
+msgstr "git-merge-base - Trouve un anc챗tre aussi bon que possible pour une fusion"
#. type: Plain text
#: en/git-merge-base.txt:17
@@ -32059,7 +31805,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -32695,9 +32441,7 @@ msgstr "git-mergetool(1)"
#: en/git-mergetool.txt:7
#, priority:240
msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
-"git-mergetool - Lancer les outils de r챕solution de conflit de fusion pour "
-"r챕soudre les conflits de fusion"
+msgstr "git-mergetool - Lancer les outils de r챕solution de conflit de fusion pour r챕soudre les conflits de fusion"
#. type: Plain text
#: en/git-mergetool.txt:12
@@ -32859,8 +32603,7 @@ msgstr "git-merge(1)"
#: en/git-merge.txt:7
#, priority:240
msgid "git-merge - Join two or more development histories together"
-msgstr ""
-"git-merge - Fusionner deux ou plusieurs historiques de d챕veloppement ensemble"
+msgstr "git-merge - Fusionner deux ou plusieurs historiques de d챕veloppement ensemble"
#. type: Plain text
#: en/git-merge.txt:17
@@ -32982,8 +32725,7 @@ msgstr ""
#: en/git-merge.txt:110
#, priority:240
msgid "Forget about the current merge in progress. Leave the index and the working tree as-is."
-msgstr ""
-"Oublier la fusion en cours. Laisser l'index et l'arbre de travail en l'梳퓍at."
+msgstr "Oublier la fusion en cours. Laisser l'index et l'arbre de travail en l'梳퓍at."
#. type: Plain text
#: en/git-merge.txt:115
@@ -33951,7 +33693,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36311,9 +36053,7 @@ msgstr "git-pack-refs(1)"
#: en/git-pack-refs.txt:7
#, priority:100
msgid "git-pack-refs - Pack heads and tags for efficient repository access"
-msgstr ""
-"git-pack-refs - Empaquette les t챗tes et les 챕tiquettes pour un acc챔s "
-"efficace au d챕p척t"
+msgstr "git-pack-refs - Empaquette les t챗tes et les 챕tiquettes pour un acc챔s efficace au d챕p척t"
#. type: Plain text
#: en/git-pack-refs.txt:12
@@ -36373,9 +36113,7 @@ msgstr "git-parse-remote(1)"
#: en/git-parse-remote.txt:7
#, priority:100
msgid "git-parse-remote - Routines to help parsing remote repository access parameters"
-msgstr ""
-"git-parse-remote - Routines pour aider 횪 analyser les param챔tres d'acc챔s aux "
-"d챕p척ts distants"
+msgstr "git-parse-remote - Routines pour aider 횪 analyser les param챔tres d'acc챔s aux d챕p척ts distants"
#. type: Plain text
#: en/git-parse-remote.txt:13
@@ -36836,13 +36574,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -37007,8 +36745,7 @@ msgstr "git-push(1)"
#: en/git-push.txt:7
#, priority:220
msgid "git-push - Update remote refs along with associated objects"
-msgstr ""
-"git-push - Met 횪 jour les r챕f챕rences distantes ainsi que les objets associ챕s"
+msgstr "git-push - Met 횪 jour les r챕f챕rences distantes ainsi que les objets associ챕s"
#. type: Plain text
#: en/git-push.txt:18
@@ -38026,8 +37763,7 @@ msgid ""
"\t\t[--index-output=<file>] [--no-sparse-checkout]\n"
"\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
msgstr ""
-"'git read-tree' [[-m [--trivial] [--aggressive] | --reset | "
-"--prefix=<pr챕fixe>]\n"
+"'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<pr챕fixe>]\n"
"\t\t[-u [--exclude-per-directory=<gitignore>] | -i]]\n"
"\t\t[--index-output=<fichier>] [--no-sparse-checkout]\n"
"\t\t(--empty | <arbre-esque1> [<arbre-esque2> [<arbre-esque3>]])\n"
@@ -38961,11 +38697,7 @@ msgstr ""
#: en/git-rebase.txt:219
#, ignore-ellipsis, priority:100
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
-msgstr ""
-"Autre cas sp챕cial, 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."
+msgstr "Autre cas sp챕cial, vous pouvez utiliser 짬혻A\\...B혻쨩 comme raccourci pour la base de fusion de `A` et `B` s'il y a exactement une seule base de fusion. Vous pouvez ne pas sp챕cifier `A` ou `B`, auquel cas ce sera `HEAD` par d챕faut."
#. type: Labeled list
#: en/git-rebase.txt:220
@@ -38992,7 +38724,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -39022,487 +38754,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr "횋diter la liste 횪 faire lors d'un rebasage interactif."
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "-X <option-de-strategie>"
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr "횎tre silencieux. Implique --no-stat."
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr "Mode bavard. Implique --stat."
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr "Cette option court-circuite le crochet pre-rebase. Voir aussi linkgit:githooks[5]."
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr "OPTIONS INCOMPATIBLES"
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr "Les options suivantes혻:"
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr "sont incompatibles avec les options suivantes혻:"
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr "--preserve-merges et --interactive"
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr "--preserve-merges et --signoff"
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr "--preserve-merges et --rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges and --interactive"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges et --interactive"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -39510,27 +39309,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -39538,154 +39339,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
+#, no-wrap, priority:100
+msgid ""
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr "Vous devriez comprendre les implications de l'utilisation de 'git rebase' sur un d챕p척t partag챕. Voir la section 짬혻RATTRAPER UN REBASAGE AMONT혻쨩 ci-dessous."
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr "valider"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr "le valider"
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39694,73 +39680,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39771,25 +39757,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39802,31 +39788,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39840,85 +39826,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39929,13 +39915,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39946,13 +39932,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39963,73 +39949,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -40040,19 +40026,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -40062,67 +40048,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -40136,25 +40122,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -40165,7 +40151,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -40175,7 +40161,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40184,55 +40170,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -40243,13 +40229,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -40257,7 +40243,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40269,7 +40255,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40278,37 +40264,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -41703,17 +41689,13 @@ msgstr "Passer l'option `--local` 횪 'git pack-objects'. Voir linkgit:git-pack-o
#: en/git-repack.txt:73
#, priority:100
msgid "Pass the `--no-reuse-delta` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
-msgstr ""
-"Passer l'option `--no-reuse-delta` 횪 `git-pack-objects`. Voir linkgit:git-"
-"pack-objects[1]."
+msgstr "Passer l'option `--no-reuse-delta` 횪 `git-pack-objects`. Voir linkgit:git-pack-objects[1]."
#. type: Plain text
#: en/git-repack.txt:77
#, priority:100
msgid "Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
-msgstr ""
-"Passer l'option `--no-reuse-object` 횪 `git-pack-objects`. Voir linkgit:git-"
-"pack-objects[1]."
+msgstr "Passer l'option `--no-reuse-object` 횪 `git-pack-objects`. Voir linkgit:git-pack-objects[1]."
#. type: Plain text
#: en/git-repack.txt:81
@@ -41803,9 +41785,7 @@ msgstr ""
#: en/git-repack.txt:167
#, priority:100
msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
-msgstr ""
-"Passer l'option `--delta-islands` 횪 `git-pack-objects`, voir linkgit:git-"
-"pack-objects[1]."
+msgstr "Passer l'option `--delta-islands` 횪 `git-pack-objects`, voir linkgit:git-pack-objects[1]."
#. type: Title -
#: en/git-repack.txt:169
@@ -41835,8 +41815,7 @@ msgstr "git-replace(1)"
#: en/git-replace.txt:7
#, priority:100
msgid "git-replace - Create, list, delete refs to replace objects"
-msgstr ""
-"git-replace - Cr챕e, liste, supprime des r챕f챕rence pour remplacer des objets"
+msgstr "git-replace - Cr챕e, liste, supprime des r챕f챕rence pour remplacer des objets"
#. type: Plain text
#: en/git-replace.txt:17
@@ -42088,10 +42067,7 @@ msgstr ""
#: en/git-replace.txt:158
#, priority:100
msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
-msgstr ""
-"linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit"
-":git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] "
-"https://github.com/newren/git-filter-repo[git-filter-repo]"
+msgstr "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -42235,8 +42211,7 @@ msgstr "git-rerere(1)"
#: en/git-rerere.txt:7
#, priority:100
msgid "git-rerere - Reuse recorded resolution of conflicted merges"
-msgstr ""
-"git-rerere - R챕utilise une r챕solution enregistr챕e de fusions conflictuelles"
+msgstr "git-rerere - R챕utilise une r챕solution enregistr챕e de fusions conflictuelles"
#. type: Plain text
#: en/git-rerere.txt:12
@@ -42924,7 +42899,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr "Apr챔s inspection du r챕sultat de la fusion, vous pouvez trouver que cette modification dans l'autre branche n'est pas satisfaisante. Lancer `git reset --hard ORIG_HEAD` vous ram챔nera 횪 l'챕tat ant챕rieur, mais cela 챕liminera aussi vos modifications locales, ce que vous ne d챕sirez pas. `git reset --merge` conserve vos modifications locales."
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr "Interruption du flux de travail"
@@ -43438,11 +43413,7 @@ msgstr ""
#: en/git-restore.txt:53
#, priority:100
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-"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`."
+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:56
@@ -43478,27 +43449,19 @@ msgstr "Silencieux, supprimer les messages d'챕tat. Implique `--no-progress`."
#: en/git-restore.txt:80
#, priority:100
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."
+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:84
#, priority:100
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
-msgstr ""
-"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."
+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:89
#, priority:100
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."
+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:97
@@ -43516,12 +43479,7 @@ msgstr ""
#: en/git-restore.txt:109
#, priority:100
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
-msgstr ""
-"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>`."
+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:116
@@ -43533,10 +43491,7 @@ msgstr ""
#: en/git-restore.txt:144
#, priority:100
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
-msgstr ""
-"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."
+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:150
@@ -43562,9 +43517,7 @@ msgstr "restaure hello.c depuis l'index"
#: en/git-restore.txt:157
#, priority:100
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"
+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:160
@@ -43576,11 +43529,7 @@ msgstr "$ git restore '*.c'\n"
#: en/git-restore.txt:166
#, priority:100
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
-msgstr ""
-"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)."
+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:168
@@ -43762,8 +43711,7 @@ msgstr "git-rev-list(1)"
#: en/git-rev-list.txt:7
#, priority:100
msgid "git-rev-list - Lists commit objects in reverse chronological order"
-msgstr ""
-"git-rev-list - Affiche les objets commit dans l'ordre chronologique inverse"
+msgstr "git-rev-list - Affiche les objets commit dans l'ordre chronologique inverse"
#. type: Plain text
#: en/git-rev-list.txt:13
@@ -44770,223 +44718,223 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr "git-rm - Supprime des fichiers de l'arbre de travail et de l'index"
#. type: Plain text
-#: en/git-rm.txt:12
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+#: en/git-rm.txt:14
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <fichier>...\n"
#. type: Plain text
-#: en/git-rm.txt:25
-#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+#: en/git-rm.txt:27
+#, fuzzy, priority:280
+#| msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr "Supprime les fichiers de l'index, ou de l'arbre de travail et de l'index. `git rm` ne supprimera pas un fichier seulement de votre r챕pertoire de travail (il n'y a aucune option pour supprimer un fichier seulement depuis l'arbre de travail et le conserver dans l'index혻; utilisez `/bin/rm` si c'est ce que vous souhaitez faire). Les fichiers 횪 supprimer doivent 챗tre identiques 횪 ceux du sommet de la branche, et avec aucune mise 횪 jour index챕e, mais ce comportement par d챕faut peut 챗tre outrepass챕 avec l'option `-f`. Quand `--cached` est fourni, le contenu index챕 doit correspondre soit au sommet de la branche soit au fichier sur disque, de sorte que le fichier puisse n'챗tre supprim챕 que de l'index."
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
-msgstr "<fichier>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, fuzzy, priority:280
+#| msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgstr "Fichiers 횪 supprimer. Les patrons de fichiers (par exemple, `*.c`) peuvent 챗tre fournis pour supprimer tous les fichiers correspondants. Si vous souhaitez que Git 챕tende les caract챔res de patrons de fichier, vous devrez peut-챗tre les 챕chapper de l'interpr챕teur de commande. Un nom de r챕pertoire en pr챕fixe (par exemple `r챕p` pour supprimer `r챕p/fichier1` et `r챕p/fichier2`) peut 챗tre indiqu챕 pour supprimer tous les fichiers dans un r챕pertoire, et r챕cursivement dans tous ses sous-r챕pertoires, mais cela n챕cessite explicitement l'option `-r`."
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
-msgstr "Fichiers 횪 supprimer. Les patrons de fichiers (par exemple, `*.c`) peuvent 챗tre fournis pour supprimer tous les fichiers correspondants. Si vous souhaitez que Git 챕tende les caract챔res de patrons de fichier, vous devrez peut-챗tre les 챕chapper de l'interpr챕teur de commande. Un nom de r챕pertoire en pr챕fixe (par exemple `r챕p` pour supprimer `r챕p/fichier1` et `r챕p/fichier2`) peut 챗tre indiqu챕 pour supprimer tous les fichiers dans un r챕pertoire, et r챕cursivement dans tous ses sous-r챕pertoires, mais cela n챕cessite explicitement l'option `-r`."
+msgid "The command removes only the paths that are known to Git."
+msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr "La correspondance de motifs de fichiers fonctionne 횪 travers les limites de r챕pertoires. Ainsi, 챕tant donn챕s deux r챕pertoires `r` et `r2`, il y a une diff챕rence entre utiliser `git rm 'r*'` et `git rm 'r/*'`, car la premi챔re forme supprime aussi le r챕pertoire `r2`."
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr "Outrepasser la v챕rification de synchronisation."
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr "Ne pas supprimer r챕ellement les fichiers. � la place, montrer juste s'ils existent dans l'index et seraient de ce fait supprim챕s par la commande."
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr "Permettre la suppression r챕cursive quand un r챕pertoire est fourni."
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr "Utilisez cette option pour d챕sindexer et supprimer les chemins seulement depuis l'index. Les fichiers de l'arbre de travail, qu'ils soient modifi챕s ou non, seront pr챕serv챕s."
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr "Sortir avec un 챕tat z챕ro m챗me si rien ne correspondait."
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr "`git rm` affiche normalement une ligne (sous la forme d'une commande `rm`) pour chaque fichier supprim챕. Cette option 챕limine cet affichage."
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr "La liste de <fichier> fournie 횪 la commande doit 챗tre faite de chemins exacts, de motifs de fichiers, ou de r챕pertoires en ent챗tes. La commande supprime seulement les fichiers connus de Git. Fournir le nom d'un fichier qui n'est pas pas reconnu par Git ne supprime pas ce fichier."
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr "La correspondance de motifs de fichiers fonctionne 횪 travers les limites de r챕pertoires. Ainsi, 챕tant donn챕s deux r챕pertoires `r` et `r2`, il y a une diff챕rence entre utiliser `git rm 'r*'` et `git rm 'r/*'`, car la premi챔re forme supprime aussi le r챕pertoire `r2`."
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr "SUPPRESSION DE FICHIERS QUI ONT DISPARU DU SYST횊ME DE FICHIERS"
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr "Il n'y a aucune option de `git rm` pour ne supprimer de l'index que les chemins qui ont disparu du syst챔me de fichier. Cependant, en fonction des cas, il y divers moyens d'y arriver."
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr "En utilisant ``git commit -a''"
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr "Si votre objectif est que le prochain commit enregistre toutes les modifications des fichiers suivis dans l'arbre de travail et enregistre toutes les suppressions de fichiers qui ont 챕t챕 supprim챕s de l'arbre de travail avec `rm` (par opposition 횪 `git rm`), utilisez `git commit -a`, qui va automatiquement d챕tecter et enregistrer toutes les suppressions. Vous pouvez aussi obtenir un effet similaire sans valider en utilisant `git add -u`."
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr "En utilisant ``git add -A''"
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr "Pour accepter une nouvelle livraison de code d'une branche de vendeur, vous souhaiterez probablement enregistrer 횪 la fois les suppressions de chemins et les ajouts de nouveaux chemins ainsi que les modifications de chemins existants."
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr "Typiquement, vous supprimeriez d'abord tous les fichiers suivis de l'arbre de travail en utilisant la commande혻:"
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr "git ls-files -z | xargs -0 rm -f\n"
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr "Ensuite, vous d챕compresseriez le nouveau code dans l'arbre de travail. D'une autre mani챔re, vous pourriez utiliser `rsync` dans votre arbre de travail."
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr "Apr챔s cela, le moyen le plus simple d'enregistrer toutes les suppressions, les ajouts et les modifications dans l'arbre de travail consiste 횪혻:"
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr "git add -A\n"
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr "Voir linkgit:git-add[1]."
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr "Autres moyens"
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr "Si tout ce que vous voulez vraiment faire, c'est de supprimer de l'index les fichiers qui ne sont plus pr챕sents dans l'arbre de travail (peut-챗tre parce que votre arbre de travail est sale, donc vous ne pouvez pas utiliser `git commit -a`), utilisez la commande suivante혻:"
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr "Seuls les sous-modules utilisant un gitfile (ce qui signifie qu'ils ont 챕t챕 clon챕s avec Git version 1.7.8 ou plus r챕cent) seront supprim챕s de l'arbre de travail, car leur d챕p척t r챕side dans le r챕pertoire `.git` du superprojet. Si un sous-module (ou un sous-module de celui-ci) utilise encore un r챕pertoire `.git`, `git rm` va d챕placer le r챕pertoire git du sous-module dans le r챕pertoire git du superprojet pour prot챕ger l'historique du sous-module. Si elle existe, la section `submodule.<nom>` dans le fichier linkgit:gitmodules[5] sera aussi supprim챕e et ce fichier sera index챕 (횪 moins que --cached ou -n ne soient utilis챕s)."
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr "Un sous-module est consid챕r챕 횪 jour quand la HEAD est identique 횪 ce qui est enregistr챕 dans l'index, qu'aucun fichier suivi n'est modifi챕 ni qu'aucun fichier non suivi non ignor챕 n'est pr챕sent dans l'arbre de travail du sous-module. Les fichiers ignor챕s sont consid챕r챕s jetables et n'emp챗chent pas un sous-module d'챗tre supprim챕."
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr "Si vous voulez seulement supprimer une extraction locale d'un sous-module de votre arbre de travail sans valider la suppression, utilisez linkgit:git-submodules[1] `deinit` 횪 la place. Voir aussi linkgit:gitsubmodules[7] pour des d챕tails sur la suppression de sous-modules."
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr "`git rm Documentation/\\*.txt`"
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr "Supprimer tous les fichiers `*.txt` de l'index qui sont sous le r챕pertoire `Documentation` et ses sous-r챕pertoires."
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr "Remarquez que l'ast챕risque `*` est 챕chapp챕 du shell dans cet exemple혻; cela permet, par l'expansion des chemins par Git et non par le shell, d'inclure les fichiers dans les sous-r챕pertoires du R챕pertoire `Documentation/`."
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr "`git rm -f git-*.sh`"
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr "Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque (c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il ne supprime pas `sous-r챕pertoire/git-toto.sh`."
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr "Chaque fois qu'une mise 횪 jour du super-projet supprime un sous-module peupl챕 (par exemple, lors d'un basculement d'un commit pr챕c챕dent la suppression 횪 un commit post챕rieur), une extraction p챕rim챕e du sous-module restera 횪 l'ancienne place. La suppression de l'ancien r챕pertoire n'est s챕curis챕e que lorsque le sous-module utilise un gitfile, car sinon l'historique du sous-module serait aussi supprim챕. Cette 챕tape sera obsol챔te lorsque la mise 횪 jour r챕cursive de sous-modules sera implant챕e."
@@ -46160,8 +46108,7 @@ msgstr "git-shell(1)"
#: en/git-shell.txt:7
#, priority:100
msgid "git-shell - Restricted login shell for Git-only SSH access"
-msgstr ""
-"git-shell - Shell de login restreint pour un acc챔s SSH vers Git seulement"
+msgstr "git-shell - Shell de login restreint pour un acc챔s SSH vers Git seulement"
#. type: Plain text
#: en/git-shell.txt:15
@@ -47524,7 +47471,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr "git-stash - Remiser les modifications d'un r챕pertoire de travail sale"
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -47534,6 +47481,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -47541,97 +47489,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
+#: en/git-stash.txt:62
#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
-#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -47639,139 +47557,236 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr "show [<options>] [<remisage>]"
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "pop [--index] [-q|--quiet] [<remise>]"
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "apply [--index] [-q|--quiet] [<remise>]"
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr "store"
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, fuzzy, priority:240
+#| msgid "This option is only applicable in non-verbose mode."
+msgid "This option is only valid for `push` command."
+msgstr "Cette option ne s�셙pplique qu�셞n mode non verbeux."
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -47780,31 +47795,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -47816,13 +47831,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47837,13 +47852,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47855,19 +47870,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47882,19 +47897,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47903,7 +47918,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48719,9 +48734,7 @@ msgstr "--strip-comments"
#: en/git-stripspace.txt:41
#, priority:100
msgid "Skip and remove all lines starting with comment character (default '#')."
-msgstr ""
-"Sauter et supprimer toutes les lignes commen챌ant par le caract챔re de "
-"commentaire (par d챕faut '#')."
+msgstr "Sauter et supprimer toutes les lignes commen챌ant par le caract챔re de commentaire (par d챕faut '#')."
#. type: Labeled list
#: en/git-stripspace.txt:43
@@ -48974,7 +48987,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -49152,7 +49165,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -49213,12 +49226,7 @@ msgstr "N'afficher que les messages d'erreur."
#: en/git-submodule.txt:275
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
-msgstr ""
-"Cette option n'est valide que pour les commandes add et update. L'챕tat "
-"d'avancement est affich챕 sur la sortie d'erreur standard par d챕faut quand "
-"elle est attach챕e 횪 un terminal, 횪 moins que -q soit sp챕cifi챕. Ce drapeau "
-"force l'챕tat d'avancement m챗me si le flux d'erreur standard n'est pas dirig챕 "
-"vers un terminal."
+msgstr "Cette option n'est valide que pour les commandes add et update. L'챕tat d'avancement est affich챕 sur la sortie d'erreur standard par d챕faut quand elle est attach챕e 횪 un terminal, 횪 moins que -q soit sp챕cifi챕. Ce drapeau force l'챕tat d'avancement m챗me si le flux d'erreur standard n'est pas dirig챕 vers un terminal."
#. type: Plain text
#: en/git-submodule.txt:279
@@ -49434,19 +49442,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51463,12 +51477,7 @@ msgstr ""
#: en/git-switch.txt:54
#, priority:100
msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit switched to using \"git switch\" or \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`. This is often used to switch quickly between two branches, or to undo a branch switch by mistake."
-msgstr ""
-"Vous pouvez utiliser la syntaxe `@{-N}` pour faire r챕f챕rence 횪 la N-i챔me "
-"derni챔re branche ou commit sur lesquels on a bascul챕 en utilisant une "
-"op챕ration 짬혻git switch혻쨩 ou 짬혻git checkout혻쨩. Vous pouvez aussi sp챕cifier `-`"
-" qui est synonyme de `@{-1}`. C'est souvent utilis챕 pour basculer rapidement "
-"entre deux branches ou pour annuler un basculement par erreur."
+msgstr "Vous pouvez utiliser la syntaxe `@{-N}` pour faire r챕f챕rence 횪 la N-i챔me derni챔re branche ou commit sur lesquels on a bascul챕 en utilisant une op챕ration 짬혻git switch혻쨩 ou 짬혻git checkout혻쨩. Vous pouvez aussi sp챕cifier `-` qui est synonyme de `@{-1}`. C'est souvent utilis챕 pour basculer rapidement entre deux branches ou pour annuler un basculement par erreur."
#. type: Labeled list
#: en/git-switch.txt:59
@@ -51486,10 +51495,7 @@ msgstr "--create <nouvelle-branche>"
#: en/git-switch.txt:64
#, priority:100
msgid "Create a new branch named `<new-branch>` starting at `<start-point>` before switching to the branch. This is a convenient shortcut for:"
-msgstr ""
-"Cr챕er une nouvelle branche nomm챕e `<nouvelle-branche>` commen챌ant 횪 `<point-"
-"de-d챕part>` avant de basculer sur cette branche. C'est un raccourci pratique "
-"pour혻:"
+msgstr "Cr챕er une nouvelle branche nomm챕e `<nouvelle-branche>` commen챌ant 횪 `<point-de-d챕part>` avant de basculer sur cette branche. C'est un raccourci pratique pour혻:"
#. type: delimited block -
#: en/git-switch.txt:68
@@ -51569,37 +51575,19 @@ msgstr ""
#: en/git-switch.txt:127
#, priority:100
msgid "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
-msgstr ""
-"Si vous avez des modifications locales sur un fichier ou plus qui sont "
-"diff챕rentes entre la branche actuelle et celle sur laquelle vous basculez, "
-"la commande refuse le basculement pour pr챕server vos modifications dans leur "
-"contexte. Cependant, avec cette option, une fusion 횪 trois points entre la "
-"branche actuelle, le contenu de votre arbre de travail et la nouvelle "
-"branche est op챕r챕e et vous serez sur la nouvelle branche."
+msgstr "Si vous avez des modifications locales sur un fichier ou plus qui sont diff챕rentes entre la branche actuelle et celle sur laquelle vous basculez, la commande refuse le basculement pour pr챕server vos modifications dans leur contexte. Cependant, avec cette option, une fusion 횪 trois points entre la branche actuelle, le contenu de votre arbre de travail et la nouvelle branche est op챕r챕e et vous serez sur la nouvelle branche."
#. type: Plain text
#: en/git-switch.txt:156
#, priority:100
msgid "When creating a new branch, set up \"upstream\" configuration. `-c` is implied. See `--track` in linkgit:git-branch[1] for details."
-msgstr ""
-"� la cr챕ation d'une nouvelle branche, 챕tablir la configuration 'upstream' ("
-"branche amont). `-c` est implicite. Voir `--track` dans linkgit:git-branch[1]"
-" pour plus de d챕tails."
+msgstr "� la cr챕ation d'une nouvelle branche, 챕tablir la configuration 'upstream' (branche amont). `-c` est implicite. Voir `--track` dans linkgit:git-branch[1] pour plus de d챕tails."
#. type: Plain text
#: en/git-switch.txt:166
#, priority:100
msgid "If no `-c` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-c` in such a case."
-msgstr ""
-"Si aucune option `-c` n'est fournie, le nom de la nouvelle branche sera "
-"d챕riv챕 de la branche de suivi 횪 distance, en regardant la partie locale de "
-"la sp챕cification de r챕f챕rence configur챕e pour le distant correspondant et en "
-"enlevant la partie initiale jusqu'au \"*\". Cela indiquerait d'utiliser le "
-"nom `hack` comme branche locale cr챕챕e 횪 partir de `origin/hack` (ou `remotes/"
-"origin/hack`, ou m챗me `refs/remotes/origin/hack`). Si le nom fourni ne "
-"contient pas de barre oblique, ou si le r챕sultat de la d챕rivation est un nom "
-"vide, la d챕rivation 챕choue. Vous pouvez sp챕cifier explicitement un nom avec "
-"`-c` dans ce cas."
+msgstr "Si aucune option `-c` n'est fournie, le nom de la nouvelle branche sera d챕riv챕 de la branche de suivi 횪 distance, en regardant la partie locale de la sp챕cification de r챕f챕rence configur챕e pour le distant correspondant et en enlevant la partie initiale jusqu'au \"*\". Cela indiquerait d'utiliser le nom `hack` comme branche locale cr챕챕e 횪 partir de `origin/hack` (ou `remotes/origin/hack`, ou m챗me `refs/remotes/origin/hack`). Si le nom fourni ne contient pas de barre oblique, ou si le r챕sultat de la d챕rivation est un nom vide, la d챕rivation 챕choue. Vous pouvez sp챕cifier explicitement un nom avec `-c` dans ce cas."
#. type: Labeled list
#: en/git-switch.txt:171
@@ -51617,22 +51605,13 @@ msgstr ""
#: en/git-switch.txt:180
#, priority:100
msgid "`git switch` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
-msgstr ""
-"`git switch` 챕choue quand la r챕f챕rence voulue est d챕j횪 extraite dans un "
-"autre arbre de travail. Cette option force l'extraction. En d'autres termes, "
-"la r챕f peut 챗tre tenue par plus d'un arbre de travail."
+msgstr "`git switch` 챕choue quand la r챕f챕rence voulue est d챕j횪 extraite dans un autre arbre de travail. Cette option force l'extraction. En d'autres termes, la r챕f peut 챗tre tenue par plus d'un arbre de travail."
#. type: Plain text
#: en/git-switch.txt:189
#, priority:100
msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
-msgstr ""
-"L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu "
-"de tous les sous-modules initialis챕s en fonction du commit enregistr챕 dans "
-"le super-projet. Si l'option n'est pas sp챕cifi챕e (ou si `--no-recurse-"
-"submodules` est sp챕cifi챕), les arbres de travail des sous-modules ne sont "
-"pas mis 횪 jour. Comme linkgit:git-submodule[1], les `HEAD` des sous-modules "
-"seront d챕tach챕es."
+msgstr "L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu de tous les sous-modules initialis챕s en fonction du commit enregistr챕 dans le super-projet. Si l'option n'est pas sp챕cifi챕e (ou si `--no-recurse-submodules` est sp챕cifi챕), les arbres de travail des sous-modules ne sont pas mis 횪 jour. Comme linkgit:git-submodule[1], les `HEAD` des sous-modules seront d챕tach챕es."
#. type: Plain text
#: en/git-switch.txt:194
@@ -51656,10 +51635,7 @@ msgstr "$ git switch monsujet\n"
#: en/git-switch.txt:209
#, priority:100
msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above switch would fail like this:"
-msgstr ""
-"Cependant, votre 짬혻fausse혻쨩 branche et votre branche correcte 짬혻monsujet혻쨩 "
-"peuvent 챗tre diff챕rentes par les fichiers que vous avez modifi챕s localement, "
-"auquel cas le basculement ci-dessus 챕chouerait comme ceci혻:"
+msgstr "Cependant, votre 짬혻fausse혻쨩 branche et votre branche correcte 짬혻monsujet혻쨩 peuvent 챗tre diff챕rentes par les fichiers que vous avez modifi챕s localement, auquel cas le basculement ci-dessus 챕chouerait comme ceci혻:"
#. type: delimited block -
#: en/git-switch.txt:213
@@ -51669,8 +51645,7 @@ msgid ""
"error: You have local changes to 'frotz'; not switching branches.\n"
msgstr ""
"$ git switch monsujet\n"
-"error��: Vos modifications locales aux fichiers suivants seraient 챕cras챕es "
-"par l'extraction��:\n"
+"error��: Vos modifications locales aux fichiers suivants seraient 챕cras챕es par l'extraction��:\n"
#. type: delimited block -
#: en/git-switch.txt:221
@@ -51712,9 +51687,7 @@ msgstr ""
#: en/git-switch.txt:244
#, priority:100
msgid "If you want to start a new branch from a remote branch of the same name:"
-msgstr ""
-"Si vous souhaitez d챕marrer une branche nouvelle depuis une branche distante "
-"du m챗me nom혻:"
+msgstr "Si vous souhaitez d챕marrer une branche nouvelle depuis une branche distante du m챗me nom혻:"
#. type: delimited block -
#: en/git-switch.txt:249
@@ -51848,9 +51821,7 @@ msgstr "git-tag(1)"
#: en/git-tag.txt:7
#, priority:240
msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
-msgstr ""
-"git-tag - Cr챕er, lister, supprimer ou v챕rifier un objet 챕tiquette sign챕 avec "
-"GPG"
+msgstr "git-tag - Cr챕er, lister, supprimer ou v챕rifier un objet 챕tiquette sign챕 avec GPG"
#. type: Plain text
#: en/git-tag.txt:20
@@ -52032,10 +52003,7 @@ msgstr "Le tri et le filtrage des 챕tiquettes sont non-sensibles 횪 la casse."
#: en/git-tag.txt:139
#, priority:240
msgid "Display tag listing in columns. See configuration variable column.tag for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
-msgstr ""
-"Afficher les 챕tiquettes en colonnes. Voir la variable de configuration "
-"column.tag pour la syntaxe de l'option. `--column` et `--no-column` sans "
-"options sont 챕quivalents 횪 'always' et 'never' respectivement."
+msgstr "Afficher les 챕tiquettes en colonnes. Voir la variable de configuration column.tag pour la syntaxe de l'option. `--column` et `--no-column` sans options sont 챕quivalents 횪 'always' et 'never' respectivement."
#. type: Plain text
#: en/git-tag.txt:141
@@ -52089,10 +52057,7 @@ msgstr "Prendre le message d'챕tiquette fourni dans le fichier indiqu챕. Utilise
#: en/git-tag.txt:182
#, priority:240
msgid "The message taken from file with `-F` and command line with `-m` are usually used as the tag message unmodified. This option lets you further edit the message taken from these sources."
-msgstr ""
-"Le message tir챕 d'un fichier avec `-F`, ou de la ligne de commande avec `-m` "
-"est g챕n챕ralement utilis챕 sans modification. Cette option permet d'챕diter au "
-"passage le message tir챕 de ces sources."
+msgstr "Le message tir챕 d'un fichier avec `-F`, ou de la ligne de commande avec `-m` est g챕n챕ralement utilis챕 sans modification. Cette option permet d'챕diter au passage le message tir챕 de ces sources."
#. type: Plain text
#: en/git-tag.txt:189
@@ -52125,7 +52090,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr "<commit>"
@@ -52572,312 +52537,325 @@ msgstr "--git-dir=<chemin>"
#. type: Plain text
#: en/git.txt:116
-#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+#, fuzzy, priority:100
+#| msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
msgstr "R챔gle le chemin vers le d챕p척t. Ceci peut aussi 챗tre contr척l챕 en r챕glant la variable d'environnement `GIT_DIR`. Ce peut 챗tre un chemin absolu ou relatif au r챕pertoire de travail actuel."
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr "--work-tree=<chemin>"
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr "R챕gler le chemin du r챕pertoire de travail. Ce peut 챗tre un chemin absolu ou un chemin relatif au r챕pertoire de travail actuel. Ceci peut aussi 챗tre contr척l챕 en r챕glant la variable d'environnement GIT_WORK_TREE et la variable de configuration core.worktree (voir core.worktree dans linkgit:git-config[1] pour une discussion plus d챕taill챕e)."
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr "--namespace=<chemin>"
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr "R챕gler l'espace de nommage Git. Voir linkgit:gitnamespaces[7] pour plus de d챕tails. 횋quivalent 횪 r챕gler la variable d'environnement `GIT_NAMESPACE`."
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr "--super-prefix=<chemin>"
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr "Actuellement pour un usage interne seulement. R챕gler un pr챕fixe qui fournit un chemin depuis un d챕p척t jusqu'횪 sa racine. Une utilisation est de fournir aux sous-modules du contexte 횪 propos du super-projet qui l'a invoqu챕."
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr "Traiter le d챕p척t comme un d챕p척t nu. Si l'environnement `GIT_DIR` n'est pas d챕fini, alors il est d챕fini au r챕pertoire de travail actuel."
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr "Ne pas utiliser des refs de remplacement pour remplacer des objets Git. Voir linkgit:git-replace[1] pour de plus amples informations."
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr "Traier les sp챕cificateurs de chemins litt챕ralement (c-횪-d sans jokers ni magie de pathspec). Ceci est 챕quivalent 횪 r챕gler la variable d'environnement `GIT_LITERAL_PATHSPECS` 횪 `1`. "
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr "Ajouter la magie 짬혻glob혻쨩 횪 tous les sp챕cificateurs de chemin. C'est 챕quivalent 횪 r챕gler la variable d'environnement `GIT_GLOB_PATHSEPCS` 횪 `1`. La d챕sactivation du traitement glob sur des sp챕cificateurs de chemin sp챕cifiques peut 챗tre r챕alis챕e en utilisant le pr챕fixe magique \":(litera)\""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr "Ajouter la magie 짬혻literal혻쨩 횪 tous les sp챕cificateurs de chemin. C'est 챕quivalent 횪 r챕gler la variable d'environnement `GIT_NOGLOB_PATHSPECS` 횪 `1`. L'activation du traitement glob sur des sp챕cificateurs de chemin sp챕cifiques peut 챗tre r챕alis챕e en utilisant le pr챕fixe magique \":(glob)\""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr "Ajouter la magie 짬혻icase혻쨩 횪 tous les sp챕cificateurs de chemin. C'est 챕quivalent 횪 r챕gler la variable d'environnement `GIT_ICASE_PATHSPECS` 횪 `1`."
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr "Commandes Porcelaine Principales"
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr "Interaction avec d'autres d챕veloppeurs"
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr "M챕canisme de configuration"
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -52886,7 +52864,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -52896,616 +52874,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr "<commit-esque>"
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
-msgstr ""
-"Si le r챕pertoire de stockage d'objets est sp챕cifi챕 via cette variable "
-"d'environnement, alors les r챕pertoires sha1 sont cr챕챕s dedans - sinon le "
-"r챕pertoire par d챕faut `$GIT_DIR/objects` est utilis챕."
+msgstr "Si le r챕pertoire de stockage d'objets est sp챕cifi챕 via cette variable d'environnement, alors les r챕pertoires sha1 sont cr챕챕s dedans - sinon le r챕pertoire par d챕faut `$GIT_DIR/objects` est utilis챕."
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr "Commits Git"
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "voir linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr "Diffs Git"
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -53520,523 +53531,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
@@ -55016,7 +55027,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr "L'extension de cache des non-suivis peut 챗tre activ챕e par la variable de configuration `core.untrackedCache` (voir linkgit:git-config[1])."
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -55427,9 +55450,7 @@ msgstr "--[no-]strict"
#: en/git-upload-pack.txt:30
#, priority:100
msgid "Do not try <directory>/.git/ if <directory> is no Git directory."
-msgstr ""
-"Ne pas essayer <r챕pertoire>/.git/ si <r챕pertoire> n'est pas un r챕pertoire "
-"Git."
+msgstr "Ne pas essayer <r챕pertoire>/.git/ si <r챕pertoire> n'est pas un r챕pertoire Git."
#. type: Plain text
#: en/git-upload-pack.txt:33
@@ -56306,11 +56327,7 @@ msgstr "--[no-]track"
#: en/git-worktree.txt:168
#, priority:240
msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See \"--track\" in linkgit:git-branch[1] for details."
-msgstr ""
-"� la cr챕ation d'une nouvelle branche, si `<commit-esque>`est une branche, la "
-"marquer comme 짬혻upstream 쨩 amont de la nouvelle branche. C'est la valeur par "
-"d챕faut si `<commit-esque>` est une branche de suivi 횪 distance. Voir 짬 --"
-"track 쨩 dans linkgit:git-branch[1] pour plus de d챕tails."
+msgstr "� la cr챕ation d'une nouvelle branche, si `<commit-esque>`est une branche, la marquer comme 짬혻upstream 쨩 amont de la nouvelle branche. C'est la valeur par d챕faut si `<commit-esque>` est une branche de suivi 횪 distance. Voir 짬 --track 쨩 dans linkgit:git-branch[1] pour plus de d챕tails."
#. type: Labeled list
#: en/git-worktree.txt:169
@@ -56328,17 +56345,13 @@ msgstr ""
#: en/git-worktree.txt:178
#, priority:240
msgid "With `prune`, do not remove anything; just report what it would remove."
-msgstr ""
-"Avec `prune`, ne rien supprimer혻; montrer seulement ce qui serait supprim챕."
+msgstr "Avec `prune`, ne rien supprimer혻; montrer seulement ce qui serait supprim챕."
#. type: Plain text
#: en/git-worktree.txt:183
#, priority:240
msgid "With `list`, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details."
-msgstr ""
-"Avec `list`, donner la sortie dans un format facile 횪 analyser par script. "
-"Ce format restera stable 횪 travers les versions de Git et sans tenir compte "
-"de la configuration utilisateur. Voir ci-dessous pour de plus amples d챕tails."
+msgstr "Avec `list`, donner la sortie dans un format facile 횪 analyser par script. Ce format restera stable 횪 travers les versions de Git et sans tenir compte de la configuration utilisateur. Voir ci-dessous pour de plus amples d챕tails."
#. type: Plain text
#: en/git-worktree.txt:187
@@ -56675,10 +56688,7 @@ msgstr ""
#: en/gitglossary.txt:24
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
-msgstr ""
-"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7]"
-", linkgit:giteveryday[7], link:user-manual.html[Le manuel d'utilisateur de "
-"Git]"
+msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[Le manuel d'utilisateur de Git]"
#. type: Labeled list
#: en/glossary-content.txt:1
@@ -57932,12 +57942,7 @@ msgstr "Remarquez que Git traite les noms de chemins comme des s챕quences d'octe
#: en/i18n.txt:29
#, priority:280
msgid "Commit log messages are typically encoded in UTF-8, but other extended ASCII encodings are also supported. This includes ISO-8859-x, CP125x and many others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5, EUC-x, CP9xx etc.)."
-msgstr ""
-"Les messages du journal des validations sont typiquement encod챕s en UTF-8, "
-"mais les autres encodages d'ASCII 챕tendu sont aussi pris en charge. Ceci "
-"inclut ISO-8859-x, CP125x et de nombreux autres, mais _pas_ UTF-16/32, "
-"EBCDIC ni les encodages multi-octets CJK (GBK, Shift-JIS, Big5, EUC-x, CP9xx "
-"etc.)."
+msgstr "Les messages du journal des validations sont typiquement encod챕s en UTF-8, mais les autres encodages d'ASCII 챕tendu sont aussi pris en charge. Ceci inclut ISO-8859-x, CP125x et de nombreux autres, mais _pas_ UTF-16/32, EBCDIC ni les encodages multi-octets CJK (GBK, Shift-JIS, Big5, EUC-x, CP9xx etc.)."
#. type: Plain text
#: en/i18n.txt:36
@@ -58053,10 +58058,7 @@ msgstr "Si le fichier '.mailmap' existe au niveau sup챕rieur du d챕p척t, ou 횪 l
#: en/mailmap.txt:10
#, priority:260
msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:"
-msgstr ""
-"Dans la forme simple, chaque ligne dans le fichier se compose du nom r챕el "
-"canonique d'un auteur, une espace, et une adresse e-mail utilis챕e dans le "
-"commit (entour챕 par '<' et '>') en correspondance ue nom. Par exemple��:"
+msgstr "Dans la forme simple, chaque ligne dans le fichier se compose du nom r챕el canonique d'un auteur, une espace, et une adresse e-mail utilis챕e dans le commit (entour챕 par '<' et '>') en correspondance ue nom. Par exemple��:"
#. type: Plain text
#: en/mailmap.txt:12
@@ -58350,9 +58352,7 @@ msgstr ""
#: en/merge-options.txt:115
#, priority:240
msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
-msgstr ""
-"Cette option court-circuite les crochets pre-merge et commit-msg. Voir aussi "
-"linkgit:githooks[5]."
+msgstr "Cette option court-circuite les crochets pre-merge et commit-msg. Voir aussi linkgit:githooks[5]."
#. type: Plain text
#: en/merge-options.txt:123
@@ -59407,7 +59407,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr "partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, voir"
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
@@ -59835,190 +59835,198 @@ msgstr "pour signer un commit sign챕"
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, fuzzy, priority:260
+#| msgid "show the fingerprint of the key used to sign a signed commit"
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr "afficher l'empreinte digitale de la cl챕 utilis챕e pour signer un commit sign챕"
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr "s챕lecteur de reflog, par exemple, `refs/stash@{1}`` ou `refs/stash@{2"
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr "minutes ago}` ; le format suit les r챔gles d챕crites pour l'option `-g'. La partie avant `@' est le refname tel qu'il est donn챕 sur la ligne de commande (donc `git log -g refs/heads/master` produirait `refs/heads/master@{0}`)."
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr "s챕lecteur de reflog raccourci ; identique 횪 `%gD', mais la partie du nom du reflog"
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr "est raccourcie pour la lisibilit챕 humaine (ainsi `refs/heads/master` devient simplement `master`)."
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr "nom de l'identit챕 reflog"
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr "nom de l'identit챕 du reflog (en respectant le fichier.mailmap, voir"
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr "adresse de courriel d'identit챕 reflog"
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr "adresse de courriel de l'identit챕 reflog (en respectant le fichier .mailmap, voir"
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr "titre du reflog"
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr "'%(trailers[:options])'"
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr "afficher les lignes d'attribut du corps comme"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr "interpr챕t챕s par linkgit:git-interpret-trailers[1]. La cha챤ne `trailers` peut 챗tre suivie de deux-points et de z챕ro ou plus d'options s챕par챕es par des virgules :"
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr "key=<K>' : affiche uniquement les cha챤nes d'attributs avec la cl챕 sp챕cifi챕e. L'appariement se fait de fa챌on insensible 횪 la casse et la virgule finale est facultative. Si l'option est donn챕e plusieurs fois, les lignes d'attributs correspondant 횪 l'une des cl챕s sont affich챕es. Cette option active automatiquement l'option `only` de sorte que les lignes non-attribut dans le bloc d'attributs soient masqu챕es. Si ce n'est pas d챕sir챕, ce peut 챗tre d챕sactiv챕 avec `only=false`. Par exemple, `%(trailers:key=Reviewed-by)` affiche les lignes d'attribut avec la cl챕 `Reviewed-by`."
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr "'only[=val]' : permet de s챕lectionner si les lignes non-attribut du bloc d'attributs doivent 챗tre incluses. Le mot-cl챕 `only` peut 챗tre 챕ventuellement suivi d'un signe 챕gal et d'une valeur `true`, `on`, `yes` pour omettre ou `false`, `off`, `no` pour afficher les lignes non-attribut. Si l'option est donn챕e sans valeur, elle est activ챕e. Si elle est donn챕e plusieurs fois, la derni챔re valeur est utilis챕e."
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr "'separator=<SEP>' : sp챕cifie un s챕parateur ins챕r챕 entre les lignes d'attributs. Lorsque cette option n'est pas activ챕e, chaque ligne d'attribut est termin챕e par un caract챔re de saut de ligne. La cha챤ne SEP peut contenir les codes de formatage litt챕ral d챕crits ci-dessus. Pour utiliser la virgule comme s챕parateur, il faut utiliser `%x2C` car sinon elle serait analys챕e comme option suivante. Si l'option s챕parateur est donn챕e plusieurs fois, seule la derni챔re est utilis챕e. Par exemple, `%(trailers:key=Ticket,separator=%x2C )` affiche toutes les lignes d'attributs dont la cl챕 est 짬혻Ticket혻쨩 s챕par챕es par une virgule et un espace."
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
-msgstr ""
-"'unfold[=val]' : se comporter comme si l'option `--unfold` d'interpr챕tation "
-"des attributs 챕tait donn챕e. De la m챗me mani챔re que pour `only`, il peut 챗tre "
-"suivi d'un signe 챕gal et d'une valeur explicite. Par exemple, "
-"`%(trailers:only,unfold=true)` d챕plie et affiche toutes les lignes "
-"d'attributs."
+msgstr "'unfold[=val]' : se comporter comme si l'option `--unfold` d'interpr챕tation des attributs 챕tait donn챕e. De la m챗me mani챔re que pour `only`, il peut 챗tre suivi d'un signe 챕gal et d'une valeur explicite. Par exemple, `%(trailers:only,unfold=true)` d챕plie et affiche toutes les lignes d'attributs."
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr "'valueonly[=val]' : sauter la partie cl챕 de la ligne d'attribut et n'afficher que la partie valeur. Ceci permet aussi optionnellement une valeur explicite."
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr "Certains espaces r챕serv챕s peuvent d챕pendre d'autres options donn챕es au moteur de travers챕e de r챕visions. Par exemple, les options de reflog `%g*` ins챕reront une cha챤ne vide 횪 moins que nous ne traversions des entr챕es de reflog (par exemple, par `git log -g`). Les caract챔res de remplissage `%d` et `%D` utiliseront le format de d챕coration 짬혻short혻쨩 si `--decorate` n'a pas d챕j횪 챕t챕 fourni sur la ligne de commande."
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr "Si vous ajoutez un `+` (signe plus) apr챔s'%' d'un espace r챕serv챕, un saut de ligne est ins챕r챕 imm챕diatement avant l'expansion si et seulement si l'espace r챕serv챕 se d챕veloppe en une cha챤ne non vide."
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr "Si vous ajoutez un `-` (signe moins) apr챔s'%' d'un caract챔re de remplissage, tous les sauts de ligne cons챕cutifs pr챕c챕dant imm챕diatement l'expansion sont supprim챕s si et seulement si l'espace r챕serv챕 se d챕veloppe en une cha챤ne vide."
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr "Si vous ajoutez un ``(espace) apr챔s'%' d'un espace r챕serv챕, un espace est ins챕r챕 imm챕diatement avant l'expansion si et seulement si l'espace r챕serv챕 se d챕veloppe en une cha챤ne non vide."
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr "'tformat:'"
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr "Le format'tformat:' fonctionne exactement comme'format:', sauf qu'il fournit une s챕mantique 짬혻terminator혻쨩 au lieu de 짬혻separator혻쨩. En d'autres termes, chaque commit a le caract챔re de fin de message (habituellement une nouvelle ligne) ajout챕, plut척t qu'un s챕parateur plac챕 entre les entr챕es. Cela signifie que l'entr챕e finale d'un format 횪 une ligne se terminera correctement par une nouvelle ligne, tout comme le format \"oneline\". Par exemple :"
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -60032,7 +60040,7 @@ msgstr ""
"7134973 -- NO NEWLINE\n"
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -60046,13 +60054,13 @@ msgstr ""
"7134973\n"
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr "De plus, toute cha챤ne non reconnue qui contient un `%` est interpr챕t챕e comme si elle avait `tformat:` devant elle. Par exemple, ces deux 챕l챕ments sont 챕quivalents :"
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -60179,11 +60187,7 @@ msgstr "Avec un argument optionnel'<ref>', utiliser la r챕f챕rence pour trouver
#: en/pretty-options.txt:80
#, priority:260
msgid "Multiple --notes options can be combined to control which notes are being displayed. Examples: \"--notes=foo\" will show only notes from \"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from \"refs/notes/foo\" and from the default notes ref(s)."
-msgstr ""
-"Plusieurs options --notes peuvent 챗tre combin챕es pour contr척ler quelles "
-"notes sont affich챕es. Exemples : \"--notes=foo\" affichera uniquement les "
-"notes de \"refs/notes/foo\" ; \"--notes=foo --notes\" affichera les notes de "
-"\"refs/notes/foo\" et des ref(s) de notes par d챕faut."
+msgstr "Plusieurs options --notes peuvent 챗tre combin챕es pour contr척ler quelles notes sont affich챕es. Exemples : \"--notes=foo\" affichera uniquement les notes de \"refs/notes/foo\" ; \"--notes=foo --notes\" affichera les notes de \"refs/notes/foo\" et des ref(s) de notes par d챕faut."
#. type: Plain text
#: en/pretty-options.txt:87
@@ -61282,11 +61286,7 @@ msgstr "--glob=<motif-glob>"
#: en/rev-list-options.txt:165
#, priority:260
msgid "Pretend as if all the refs matching shell glob '<glob-pattern>' are listed on the command line as '<commit>'. Leading 'refs/', is automatically prepended if missing. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
-msgstr ""
-"Faire comme si toutes les r챕fs correspondant au shell glob'<motif-glob>' "
-"챕taient list챕es sur la ligne de commande comme'<commit>'. Le pr챕fixe 'refs/"
-"', est automatiquement ajout챕 s'il n'y en a pas. Si le motif ne pr챕sente pas "
-"de '?', '{asterisk}', ni '[', '/{asterisk}' 횪 la fin est implicite."
+msgstr "Faire comme si toutes les r챕fs correspondant au shell glob'<motif-glob>' 챕taient list챕es sur la ligne de commande comme'<commit>'. Le pr챕fixe 'refs/', est automatiquement ajout챕 s'il n'y en a pas. Si le motif ne pr챕sente pas de '?', '{asterisk}', ni '[', '/{asterisk}' 횪 la fin est implicite."
#. type: Labeled list
#: en/rev-list-options.txt:181
@@ -61376,13 +61376,7 @@ msgstr "Omettre tout commit qui introduit le m챗me changement qu'un autre commit
#: en/rev-list-options.txt:244
#, priority:260
msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output."
-msgstr ""
-"Par exemple, si vous avez deux branches, `A` et `B`, une fa챌on habituelle de "
-"lister tous les commits d'un seul c척t챕 d'entre elles est avec `--left-right` "
-"(voir l'exemple ci-dessous dans la description de l'option `--left-right`). "
-"Cependant, cela montre les commits qui ont 챕t챕 picor챕s sur l'autre branche ("
-"par exemple, ``3rd on b'' peut 챗tre tri챕 sur la branche A). Avec cette "
-"option, ces paires de commits sont exclues de la sortie."
+msgstr "Par exemple, si vous avez deux branches, `A` et `B`, une fa챌on habituelle de lister tous les commits d'un seul c척t챕 d'entre elles est avec `--left-right` (voir l'exemple ci-dessous dans la description de l'option `--left-right`). Cependant, cela montre les commits qui ont 챕t챕 picor챕s sur l'autre branche (par exemple, ``3rd on b'' peut 챗tre tri챕 sur la branche A). Avec cette option, ces paires de commits sont exclues de la sortie."
#. type: Labeled list
#: en/rev-list-options.txt:245
@@ -61928,10 +61922,7 @@ msgstr "De m챗me, la liste des parents de `P` a eu `I` supprim챕. `P` a ensuite
#: en/rev-list-options.txt:535
#, priority:260
msgid "`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it was a TREESAME root. `Q` was then removed completely, because it had one parent and is TREESAME."
-msgstr ""
-"La liste des parents de `Q` a rendu `Y` simplifi챕 en `X`. `X` a ensuite 챕t챕 "
-"supprim챕, parce que c'챕tait une racine MEMEARBRE. `Q` a ensuite 챕t챕 "
-"compl챔tement supprim챕e, parce qu'elle avait un parent et qu'il est MEMEARBRE."
+msgstr "La liste des parents de `Q` a rendu `Y` simplifi챕 en `X`. `X` a ensuite 챕t챕 supprim챕, parce que c'챕tait une racine MEMEARBRE. `Q` a ensuite 챕t챕 compl챔tement supprim챕e, parce qu'elle avait un parent et qu'il est MEMEARBRE."
#. type: Plain text
#: en/rev-list-options.txt:538
@@ -62011,13 +62002,7 @@ msgstr "Aides 횪 la bisection"
#: en/rev-list-options.txt:596
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
-msgstr ""
-"Limiter la sortie 횪 l'objet commit qui est 횪 peu pr챔s 횪 mi-chemin entre les "
-"commits inclus et les commits exclus. Notez que la r챕f챕rence mauvaise de "
-"bissection `refs/bisect/bad` est ajout챕e aux commits inclus (si elle existe) "
-"et la r챕f챕rence bonne de bissection `refs/bisect/good-*` est ajout챕e aux "
-"commits exclus (s'ils existent). Ainsi, en supposant qu'il n'y ait pas de "
-"r챕f챕rences dans `refs/bisect/`, si"
+msgstr "Limiter la sortie 횪 l'objet commit qui est 횪 peu pr챔s 횪 mi-chemin entre les commits inclus et les commits exclus. Notez que la r챕f챕rence mauvaise de bissection `refs/bisect/bad` est ajout챕e aux commits inclus (si elle existe) et la r챕f챕rence bonne de bissection `refs/bisect/good-*` est ajout챕e aux commits exclus (s'ils existent). Ainsi, en supposant qu'il n'y ait pas de r챕f챕rences dans `refs/bisect/`, si"
#. type: delimited block -
#: en/rev-list-options.txt:599
@@ -62225,10 +62210,7 @@ msgstr "--indexed-objects"
#: en/rev-list-options.txt:720
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
-msgstr ""
-"Faire comme si tous les arbres et tous les blobs utilis챕s par l'index "
-"챕taient list챕s sur la ligne de commande. Notez que vous voudrez "
-"probablement utiliser aussi `--objects`."
+msgstr "Faire comme si tous les arbres et tous les blobs utilis챕s par l'index 챕taient list챕s sur la ligne de commande. Notez que vous voudrez probablement utiliser aussi `--objects`."
#. type: Plain text
#: en/rev-list-options.txt:724
@@ -63118,6 +63100,16 @@ msgstr ""
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr "une URL telle que 짬혻git://exemple.org/chemin/vers/le/depot.git혻쨩 sera r챕챕crite en 짬혻ssh://exemple.org/chemin/vers/le/depot.git혻쨩 pour les pouss챕es, mais les tirages utiliseront encore l'URL originale."
+#, ignore-ellipsis
+#~ msgid "<file>..."
+#~ msgstr "<fichier>..."
+
+#~ msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
+#~ msgstr "La liste de <fichier> fournie 횪 la commande doit 챗tre faite de chemins exacts, de motifs de fichiers, ou de r챕pertoires en ent챗tes. La commande supprime seulement les fichiers connus de Git. Fournir le nom d'un fichier qui n'est pas pas reconnu par Git ne supprime pas ce fichier."
+
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "voir linkgit:git-commit-tree[1]"
+
#, ignore-ellipsis
#~ msgid "'git checkout' [<tree-ish>] [--] <pathspec>..."
#~ msgstr "'git checkout' [<arbre-esque>] [--] <sp챕c. de chemin>..."
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index 10da99b..1f3c13a 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2019-12-10 22:56+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -76,7 +76,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -274,7 +274,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -706,7 +706,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1653,8 +1653,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2449,61 +2449,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3537,7 +3537,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,13 +3549,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4048,7 +4048,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4084,7 +4084,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4104,7 +4104,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4716,15 +4716,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4854,13 +4854,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4896,7 +4896,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4938,13 +4938,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4956,7 +4956,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5004,13 +5004,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5354,7 +5354,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5372,7 +5372,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5396,253 +5396,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5683,7 +5683,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5725,13 +5725,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5743,7 +5743,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5761,13 +5761,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5791,13 +5791,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5971,43 +5971,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6049,7 +6049,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6373,13 +6373,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6407,7 +6407,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6429,7 +6429,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6471,7 +6471,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6501,7 +6501,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6593,37 +6593,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6683,7 +6683,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6695,7 +6695,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6707,7 +6707,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6719,19 +6719,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6743,7 +6743,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6797,115 +6797,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6991,7 +6992,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7021,8 +7022,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7033,7 +7034,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7105,7 +7106,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7128,8 +7129,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7321,7 +7322,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7351,7 +7352,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7491,7 +7492,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7681,7 +7682,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9243,7 +9244,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9267,7 +9268,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9555,7 +9556,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9679,7 +9680,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10092,7 +10093,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10128,7 +10129,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10347,7 +10348,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10671,13 +10672,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10767,7 +10768,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10918,127 +10919,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11514,7 +11521,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11706,7 +11713,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11892,7 +11899,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12628,7 +12635,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12652,7 +12659,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12878,7 +12885,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13444,7 +13451,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13588,7 +13595,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13684,7 +13691,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13982,7 +13989,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14042,89 +14049,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14331,7 +14314,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14427,7 +14410,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14730,13 +14713,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14746,13 +14729,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14761,19 +14744,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14783,31 +14766,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14817,55 +14800,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14886,18 +14923,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15078,7 +15115,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15337,204 +15374,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15545,7 +15594,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15555,7 +15604,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15565,7 +15614,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15575,7 +15624,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15587,157 +15636,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15747,13 +15796,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15766,19 +15815,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15786,13 +15835,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15879,7 +15928,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19212,7 +19261,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22483,7 +22532,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22872,7 +22921,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23631,7 +23680,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24250,7 +24299,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26014,7 +26063,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26384,7 +26433,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26460,575 +26509,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27066,7 +27133,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30580,7 +30647,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30646,7 +30713,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30771,97 +30838,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30882,7 +30949,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31390,7 +31457,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33261,7 +33328,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36142,13 +36209,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38286,7 +38353,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38316,487 +38383,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38804,27 +38938,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38832,154 +38968,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38988,73 +39309,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39065,25 +39386,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39096,31 +39417,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39134,85 +39455,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39223,13 +39544,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39240,13 +39561,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39257,73 +39578,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39334,19 +39655,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39356,67 +39677,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39430,25 +39751,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39459,7 +39780,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39469,7 +39790,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39478,55 +39799,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39537,13 +39858,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39551,7 +39872,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39563,7 +39884,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39572,37 +39893,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42174,7 +42495,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43906,223 +44227,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46651,7 +46969,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46661,6 +46979,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46668,97 +46987,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46766,139 +47055,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46907,31 +47292,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46943,13 +47328,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46964,13 +47349,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46982,19 +47367,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47009,19 +47394,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47030,7 +47415,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48010,7 +48395,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48188,7 +48573,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48465,19 +48850,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51100,7 +51491,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -51538,311 +51929,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51851,7 +52254,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51861,613 +52264,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52482,523 +52921,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53978,7 +54417,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58311,7 +58762,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58739,185 +59190,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58927,7 +59390,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58937,13 +59400,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
diff --git a/po/documentation.id.po b/po/documentation.id.po
index ed7b092..cdf29cb 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -76,7 +76,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -274,7 +274,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -706,7 +706,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1653,8 +1653,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2449,61 +2449,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3537,7 +3537,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,13 +3549,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4048,7 +4048,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4084,7 +4084,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4104,7 +4104,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4716,15 +4716,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4854,13 +4854,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4896,7 +4896,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4938,13 +4938,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4956,7 +4956,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5004,13 +5004,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5354,7 +5354,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5372,7 +5372,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5396,253 +5396,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5683,7 +5683,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5725,13 +5725,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5743,7 +5743,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5761,13 +5761,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5791,13 +5791,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5971,43 +5971,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6049,7 +6049,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6373,13 +6373,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6407,7 +6407,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6429,7 +6429,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6471,7 +6471,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6501,7 +6501,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6593,37 +6593,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6683,7 +6683,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6695,7 +6695,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6707,7 +6707,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6719,19 +6719,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6743,7 +6743,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6797,115 +6797,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6991,7 +6992,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7021,8 +7022,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7033,7 +7034,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7105,7 +7106,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7128,8 +7129,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7321,7 +7322,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7351,7 +7352,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7491,7 +7492,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7681,7 +7682,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9243,7 +9244,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9267,7 +9268,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9555,7 +9556,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9679,7 +9680,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10092,7 +10093,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10128,7 +10129,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10347,7 +10348,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10671,13 +10672,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10767,7 +10768,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10918,127 +10919,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11514,7 +11521,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11706,7 +11713,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11892,7 +11899,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12628,7 +12635,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12652,7 +12659,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12878,7 +12885,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13444,7 +13451,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13588,7 +13595,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13684,7 +13691,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13982,7 +13989,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14042,89 +14049,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14331,7 +14314,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14427,7 +14410,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14730,13 +14713,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14746,13 +14729,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14761,19 +14744,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14783,31 +14766,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14817,55 +14800,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14886,18 +14923,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15078,7 +15115,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15337,204 +15374,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15545,7 +15594,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15555,7 +15604,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15565,7 +15614,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15575,7 +15624,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15587,157 +15636,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15747,13 +15796,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15766,19 +15815,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15786,13 +15835,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15879,7 +15928,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19212,7 +19261,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22483,7 +22532,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22872,7 +22921,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23631,7 +23680,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24250,7 +24299,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26014,7 +26063,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26384,7 +26433,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26460,575 +26509,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27066,7 +27133,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30580,7 +30647,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30646,7 +30713,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30771,97 +30838,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30882,7 +30949,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31390,7 +31457,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33261,7 +33328,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36142,13 +36209,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38286,7 +38353,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38316,487 +38383,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38804,27 +38938,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38832,154 +38968,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38988,73 +39309,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39065,25 +39386,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39096,31 +39417,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39134,85 +39455,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39223,13 +39544,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39240,13 +39561,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39257,73 +39578,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39334,19 +39655,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39356,67 +39677,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39430,25 +39751,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39459,7 +39780,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39469,7 +39790,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39478,55 +39799,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39537,13 +39858,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39551,7 +39872,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39563,7 +39884,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39572,37 +39893,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42174,7 +42495,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43906,223 +44227,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46651,7 +46969,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46661,6 +46979,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46668,97 +46987,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46766,139 +47055,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46907,31 +47292,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46943,13 +47328,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46964,13 +47349,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46982,19 +47367,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47009,19 +47394,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47030,7 +47415,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48010,7 +48395,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48188,7 +48573,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48465,19 +48850,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51100,7 +51491,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -51538,311 +51929,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51851,7 +52254,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51861,613 +52264,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52482,523 +52921,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53978,7 +54417,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58311,7 +58762,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58739,185 +59190,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58927,7 +59390,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58937,13 +59400,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
diff --git a/po/documentation.it.po b/po/documentation.it.po
index 0bfc54b..54e9988 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2019-11-22 20:04+0000\n"
"Last-Translator: Francesco Zannino <francesco.zannino@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +31,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -79,7 +79,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -127,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -277,7 +277,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -709,7 +709,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr "Operativit횪 bidirezionale tra un repository Subversion e Git"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1656,8 +1656,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr "Aggiorna in modo sicuro il nome oggetto salvato in un riferimento"
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2452,61 +2452,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3540,7 +3540,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3552,13 +3552,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4019,7 +4019,7 @@ msgid "Synonym for `-p --stat`."
msgstr "sinonimo di '-p --stat'"
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4051,7 +4051,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4087,7 +4087,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4107,7 +4107,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4719,15 +4719,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4857,13 +4857,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4899,7 +4899,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4941,13 +4941,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4959,7 +4959,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4971,7 +4971,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5007,13 +5007,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5103,7 +5103,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5235,7 +5235,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr "Vedere anche l'opzione di configurazione`fetch.negotiationAlgorithm`documentata in linkgit:git-config[1]."
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5247,13 +5247,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5285,7 +5285,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5357,7 +5357,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5375,7 +5375,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5399,253 +5399,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, fuzzy, priority:300
msgid "Be verbose."
msgstr "visualizza ulteriori dettagli"
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5686,7 +5686,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5728,13 +5728,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5746,7 +5746,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5764,13 +5764,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "consenti l'aggiunta di file altrimenti ignorati"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5794,13 +5794,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5974,43 +5974,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6052,7 +6052,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6364,7 +6364,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6376,13 +6376,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6410,7 +6410,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6432,7 +6432,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6474,7 +6474,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6504,7 +6504,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6596,37 +6596,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6686,7 +6686,7 @@ msgid "Run interactively."
msgstr "esegui in modalit횪 interattiva"
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6698,7 +6698,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6710,7 +6710,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6722,19 +6722,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6746,7 +6746,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6800,115 +6800,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6994,7 +6995,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7024,8 +7025,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7036,7 +7037,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7108,7 +7109,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7131,8 +7132,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7324,7 +7325,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7354,7 +7355,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7494,7 +7495,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7684,7 +7685,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, fuzzy, no-wrap, priority:240
msgid "<tree-ish>"
msgstr "espressione albero"
@@ -9246,7 +9247,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9270,7 +9271,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9558,7 +9559,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9682,7 +9683,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10095,7 +10096,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, fuzzy, no-wrap, priority:240
msgid "<object>"
msgstr "oggetto"
@@ -10131,7 +10132,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10350,7 +10351,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10674,13 +10675,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10770,7 +10771,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10921,127 +10922,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11517,7 +11524,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, fuzzy, priority:240
msgid "Quiet, suppress feedback messages."
msgstr "non visualizzare i messaggi di feedback"
@@ -11709,7 +11716,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11895,7 +11902,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12631,7 +12638,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12655,7 +12662,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12881,7 +12888,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13447,7 +13454,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13591,7 +13598,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13687,7 +13694,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, fuzzy, no-wrap, priority:300
msgid "<repository>"
msgstr "repository"
@@ -13985,7 +13992,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14045,89 +14052,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14334,7 +14317,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14430,7 +14413,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14733,13 +14716,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14749,13 +14732,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14764,19 +14747,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14786,31 +14769,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14820,55 +14803,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14889,18 +14926,18 @@ msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15081,7 +15118,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15340,204 +15377,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15548,7 +15597,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15558,7 +15607,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15568,7 +15617,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15578,7 +15627,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15590,157 +15639,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15750,13 +15799,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15769,19 +15818,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15789,13 +15838,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15882,7 +15931,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19215,7 +19264,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22486,7 +22535,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22875,7 +22924,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23634,7 +23683,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24253,7 +24302,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26017,7 +26066,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26387,7 +26436,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26463,575 +26512,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, fuzzy, priority:100
msgid "Don't match the pattern in binary files."
msgstr "non cercare corrispondenze ai pattern nei file binari"
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, fuzzy, priority:100
msgid "Print an empty line between matches from different files."
msgstr "stampa una riga vuota fra le corrispondenze in file differenti"
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27069,7 +27136,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30583,7 +30650,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, fuzzy, no-wrap, priority:100
msgid "other"
msgstr "Altro"
@@ -30649,7 +30716,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr "<file>"
@@ -30777,97 +30844,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30888,7 +30955,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31396,7 +31463,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33267,7 +33334,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36148,13 +36215,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38292,7 +38359,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38322,487 +38389,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, fuzzy, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr "modifica l'elenco todo durante un rebase interattivo"
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, fuzzy, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr "sii silenzioso. implica --no-stat"
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38810,27 +38944,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38838,154 +38974,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38994,73 +39315,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39071,25 +39392,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39102,31 +39423,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39140,85 +39461,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39229,13 +39550,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39246,13 +39567,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39263,73 +39584,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39340,19 +39661,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39362,67 +39683,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39436,25 +39757,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39465,7 +39786,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39475,7 +39796,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39484,55 +39805,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39543,13 +39864,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39557,7 +39878,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39569,7 +39890,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39578,37 +39899,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42179,7 +42500,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43911,223 +44232,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr "Rimuove file dall'albero di lavoro e dall'indice"
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, fuzzy, priority:280
msgid "Override the up-to-date check."
msgstr "ignora il controllo sullo stato di aggiornamento"
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, fuzzy, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr "esci con codice d'uscita zero anche nel caso in cui non vi siano corrispondenze"
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, fuzzy, priority:280
msgid "See linkgit:git-add[1]."
msgstr "linkgit:git-add[1]"
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46660,7 +46978,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46670,6 +46988,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46677,97 +46996,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46775,139 +47064,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, fuzzy, no-wrap, priority:240
msgid "store"
msgstr "punteggio"
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46916,31 +47301,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46952,13 +47337,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46973,13 +47358,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46991,19 +47376,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47018,19 +47403,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47039,7 +47424,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48019,7 +48404,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48197,7 +48582,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48474,19 +48859,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51109,7 +51500,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, fuzzy, no-wrap, priority:240
msgid "<commit>"
msgstr "`commit`"
@@ -51552,311 +51943,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, fuzzy, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr "Comandi principali di alto livello"
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr "Interazione con altri"
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51865,7 +52268,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51875,613 +52278,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
-#, fuzzy, priority:100
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "linkgit:git-commit-tree[1]"
+#: en/git.txt:529
+#, priority:100
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52496,523 +52935,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53992,7 +54431,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58325,7 +58776,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58753,185 +59204,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58941,7 +59404,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58951,13 +59414,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -61942,3 +62405,7 @@ msgstr ""
#, priority:300
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+
+#, fuzzy
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index e6ca9ad..32fd2a2 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: git-manpages-l10n\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-03-02 13:01+0100\n"
"Last-Translator: Jean-No챘l AVILA <jn.avila@free.fr>\n"
"Language-Team: Korean\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#. type: Labeled list
@@ -29,7 +29,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -77,7 +77,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -125,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -275,7 +275,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -707,7 +707,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1654,8 +1654,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2450,61 +2450,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3538,7 +3538,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3550,13 +3550,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4017,7 +4017,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4049,7 +4049,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4085,7 +4085,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4105,7 +4105,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4717,15 +4717,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4855,13 +4855,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4897,7 +4897,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4939,13 +4939,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4957,7 +4957,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4969,7 +4969,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5005,13 +5005,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5101,7 +5101,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5233,7 +5233,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5245,13 +5245,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5283,7 +5283,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5355,7 +5355,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5373,7 +5373,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5397,253 +5397,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5684,7 +5684,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5726,13 +5726,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5744,7 +5744,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5762,13 +5762,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5792,13 +5792,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5972,43 +5972,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6050,7 +6050,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6362,7 +6362,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6374,13 +6374,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6408,7 +6408,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6430,7 +6430,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6472,7 +6472,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6502,7 +6502,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6594,37 +6594,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6684,7 +6684,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6696,7 +6696,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6708,7 +6708,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6720,19 +6720,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6744,7 +6744,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6798,115 +6798,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6992,7 +6993,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7022,8 +7023,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7034,7 +7035,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7106,7 +7107,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7129,8 +7130,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7322,7 +7323,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7352,7 +7353,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7492,7 +7493,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7682,7 +7683,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9244,7 +9245,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9268,7 +9269,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9556,7 +9557,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9680,7 +9681,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10093,7 +10094,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10129,7 +10130,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10348,7 +10349,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10672,13 +10673,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10768,7 +10769,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10919,127 +10920,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:42
+#, priority:100
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11515,7 +11522,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11707,7 +11714,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11893,7 +11900,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12629,7 +12636,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12653,7 +12660,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12879,7 +12886,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13445,7 +13452,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13589,7 +13596,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13685,7 +13692,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13983,7 +13990,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14043,89 +14050,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14332,7 +14315,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14428,7 +14411,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14731,13 +14714,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14747,13 +14730,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14762,19 +14745,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14784,31 +14767,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14818,55 +14801,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14887,18 +14924,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15079,7 +15116,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15338,204 +15375,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15546,7 +15595,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15556,7 +15605,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15566,7 +15615,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15576,7 +15625,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15588,157 +15637,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15748,13 +15797,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15767,19 +15816,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15787,13 +15836,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15880,7 +15929,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19213,7 +19262,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22484,7 +22533,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22873,7 +22922,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23632,7 +23681,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24251,7 +24300,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -25242,7 +25291,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
msgstr ""
#. type: delimited block -
@@ -26012,7 +26061,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26382,7 +26431,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26458,575 +26507,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27064,7 +27131,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30578,7 +30645,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30644,7 +30711,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30769,97 +30836,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30880,7 +30947,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31388,7 +31455,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33259,7 +33326,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36140,13 +36207,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38284,7 +38351,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38314,487 +38381,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38802,27 +38936,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38830,154 +38966,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
+#, no-wrap, priority:100
+msgid ""
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38986,73 +39307,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39063,25 +39384,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39094,31 +39415,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39132,85 +39453,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39221,13 +39542,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39238,13 +39559,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39255,73 +39576,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39332,19 +39653,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39354,67 +39675,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39428,25 +39749,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39457,7 +39778,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39467,7 +39788,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39476,55 +39797,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39535,13 +39856,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39549,7 +39870,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39561,7 +39882,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39570,37 +39891,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42170,7 +42491,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43902,223 +44223,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46647,7 +46965,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46657,6 +46975,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46664,97 +46983,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
+#: en/git-stash.txt:62
#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
-#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46762,139 +47051,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46903,31 +47288,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46939,13 +47324,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46960,13 +47345,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46978,19 +47363,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47005,19 +47390,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47026,7 +47411,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48006,7 +48391,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48184,7 +48569,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48461,19 +48846,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51095,7 +51486,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -51533,311 +51924,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51846,7 +52249,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51856,613 +52259,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52477,523 +52916,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53973,7 +54412,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58300,7 +58751,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58728,185 +59179,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58916,7 +59379,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58926,13 +59389,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index 1607552..86a95db 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git-manpages-l 10n\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-02-17 13:50+0000\n"
"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
"Language-Team: Marathi\n"
@@ -31,7 +31,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -79,7 +79,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -127,7 +127,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -277,7 +277,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -709,7 +709,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1656,8 +1656,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2452,61 +2452,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3540,7 +3540,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3552,13 +3552,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4019,7 +4019,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4051,7 +4051,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4087,7 +4087,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4107,7 +4107,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4719,15 +4719,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4857,13 +4857,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4899,7 +4899,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4941,13 +4941,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4959,7 +4959,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4971,7 +4971,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5007,13 +5007,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5103,7 +5103,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5235,7 +5235,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5247,13 +5247,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5285,7 +5285,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5357,7 +5357,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5375,7 +5375,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5399,253 +5399,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "西듀ㅀ誓띭ㄼ誓뗠쩂 西듀쪓西밝ㅎ."
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5686,7 +5686,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "西듀ㅀ誓띭ㄳ西�"
@@ -5728,13 +5728,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "西むㅀ誓띭ㄿ西약ㄿ"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<pathspec> ..."
@@ -5746,12 +5746,10 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
-msgstr ""
-"<pathspec> 西듀ㅎ西뺖쪓西�ㅀ西싟ㄸ西� 西듀ㅏ西룅ㄿ誓� 西끶ㄷ西욈쨻 西ㅰㄺ西뜩�西꿋ㅎ西귖ㅈ西약쩆誓�,linkgit:gitglossary[7] 西�ㄷ誓띭ㄿ誓� "
-"'pathspec' 西む쪓西겯ㅅ西욈ㅇ誓띭쩅誓� 西むㅉ西�."
+msgstr "<pathspec> 西듀ㅎ西뺖쪓西�ㅀ西싟ㄸ西� 西듀ㅏ西룅ㄿ誓� 西끶ㄷ西욈쨻 西ㅰㄺ西뜩�西꿋ㅎ西귖ㅈ西약쩆誓�,linkgit:gitglossary[7] 西�ㄷ誓띭ㄿ誓� 'pathspec' 西む쪓西겯ㅅ西욈ㅇ誓띭쩅誓� 西むㅉ西�."
#. type: Plain text
#: en/git-add.txt:73
@@ -5766,13 +5764,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "西╆쪇西겯쪓西꿋쨻誓띭ㅇ 西뺖쪍西꿋쪍西꿋쪓西�ㅎ 西ムㅎ西�ㅂ誓� 西쒉쪑西□ㄳ誓띭ㄿ西약쩀誓� 西むㅀ西듀ㅎ西ⓣ쨽誓� 西╆쪓西�ㅎ."
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5796,13 +5794,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5976,43 +5974,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6054,7 +6052,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6366,7 +6364,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6378,13 +6376,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6412,7 +6410,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6434,7 +6432,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6476,7 +6474,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6506,7 +6504,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6598,37 +6596,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6688,7 +6686,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6700,7 +6698,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6712,7 +6710,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6724,19 +6722,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6748,7 +6746,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6802,115 +6800,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6996,7 +6995,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7026,8 +7025,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7038,7 +7037,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7110,7 +7109,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7133,8 +7132,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7326,7 +7325,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7356,7 +7355,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7496,7 +7495,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7686,7 +7685,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9248,7 +9247,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9272,7 +9271,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9560,7 +9559,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9684,7 +9683,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10097,7 +10096,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10133,7 +10132,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10352,7 +10351,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10676,13 +10675,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10772,7 +10771,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10923,127 +10922,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:42
+#, priority:100
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11519,7 +11524,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11711,7 +11716,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11897,7 +11902,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12633,7 +12638,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12657,7 +12662,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12883,7 +12888,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13449,7 +13454,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13593,7 +13598,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13689,7 +13694,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13987,7 +13992,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14047,89 +14052,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14336,7 +14317,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14432,7 +14413,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14735,13 +14716,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14751,13 +14732,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14766,19 +14747,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14788,31 +14769,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14822,55 +14803,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14891,18 +14926,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15083,7 +15118,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15342,204 +15377,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15550,7 +15597,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15560,7 +15607,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15570,7 +15617,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15580,7 +15627,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15592,157 +15639,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15752,13 +15799,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15771,19 +15818,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15791,13 +15838,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15884,7 +15931,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19217,7 +19264,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22488,7 +22535,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22877,7 +22924,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23636,7 +23683,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24255,7 +24302,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26016,7 +26063,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26386,7 +26433,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26462,575 +26509,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27068,7 +27133,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30582,7 +30647,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30648,7 +30713,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30773,97 +30838,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30884,7 +30949,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31392,7 +31457,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33263,7 +33328,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36144,13 +36209,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38288,7 +38353,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38318,487 +38383,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38806,27 +38938,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38834,154 +38968,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38990,73 +39309,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39067,25 +39386,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39098,31 +39417,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39136,85 +39455,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39225,13 +39544,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39242,13 +39561,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39259,73 +39578,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39336,19 +39655,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39358,67 +39677,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39432,25 +39751,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39461,7 +39780,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39471,7 +39790,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39480,55 +39799,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39539,13 +39858,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39553,7 +39872,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39565,7 +39884,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39574,37 +39893,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42174,7 +42493,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43906,223 +44225,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46651,7 +46967,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46661,6 +46977,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46668,97 +46985,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46766,139 +47053,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46907,31 +47290,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46943,13 +47326,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46964,13 +47347,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46982,19 +47365,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47009,19 +47392,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47030,7 +47413,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48010,7 +48393,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48188,7 +48571,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48465,19 +48848,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51099,7 +51488,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -51537,311 +51926,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51850,7 +52251,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51860,613 +52261,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52481,523 +52918,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53977,7 +54414,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58309,7 +58758,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58737,185 +59186,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58925,7 +59386,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58935,13 +59396,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 1cb69cc..3219f0a 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2019-10-14 23:28+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -74,7 +74,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -86,7 +86,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -122,7 +122,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -274,7 +274,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -706,7 +706,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1654,8 +1654,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2450,61 +2450,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3538,7 +3538,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3550,13 +3550,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4017,7 +4017,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4049,7 +4049,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4085,7 +4085,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4105,7 +4105,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4717,15 +4717,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4855,13 +4855,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4897,7 +4897,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4939,13 +4939,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4957,7 +4957,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4969,7 +4969,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5005,13 +5005,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5101,7 +5101,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5233,7 +5233,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5245,13 +5245,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5283,7 +5283,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5355,7 +5355,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5373,7 +5373,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5397,253 +5397,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5684,7 +5684,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5726,13 +5726,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5744,7 +5744,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5762,13 +5762,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5792,13 +5792,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5972,44 +5972,44 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, fuzzy, no-wrap, priority:300
#| msgid "--ignore-removal"
msgid "--pathspec-from-file=<file>"
msgstr "--ignore-removal"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6051,7 +6051,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6363,7 +6363,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6375,13 +6375,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6409,7 +6409,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6431,7 +6431,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6473,7 +6473,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6503,7 +6503,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6595,37 +6595,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6685,7 +6685,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6697,7 +6697,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6709,7 +6709,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6721,19 +6721,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6745,7 +6745,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6799,115 +6799,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6993,7 +6994,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7023,8 +7024,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7035,7 +7036,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7107,7 +7108,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7130,8 +7131,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7323,7 +7324,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7353,7 +7354,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7493,7 +7494,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7683,7 +7684,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9245,7 +9246,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9269,7 +9270,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9557,7 +9558,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9681,7 +9682,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10094,7 +10095,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10130,7 +10131,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10349,7 +10350,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10673,13 +10674,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10769,7 +10770,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10920,127 +10921,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11516,7 +11523,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11708,7 +11715,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11894,7 +11901,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12630,7 +12637,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12654,7 +12661,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12880,7 +12887,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13446,7 +13453,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13590,7 +13597,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13686,7 +13693,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13984,7 +13991,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14044,89 +14051,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14333,7 +14316,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14429,7 +14412,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14732,13 +14715,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14748,13 +14731,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14763,19 +14746,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14785,31 +14768,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14819,55 +14802,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14888,18 +14925,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15080,7 +15117,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15339,204 +15376,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15547,7 +15596,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15557,7 +15606,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15567,7 +15616,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15577,7 +15626,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15589,157 +15638,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15749,13 +15798,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15768,19 +15817,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15788,13 +15837,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15881,7 +15930,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19214,7 +19263,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22485,7 +22534,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22874,7 +22923,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23633,7 +23682,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24252,7 +24301,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26017,7 +26066,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26387,7 +26436,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26463,575 +26512,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27069,7 +27136,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30583,7 +30650,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30649,7 +30716,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30774,97 +30841,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30885,7 +30952,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31393,7 +31460,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33264,7 +33331,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36145,13 +36212,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38289,7 +38356,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38319,487 +38386,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38807,27 +38941,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38835,154 +38971,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38991,73 +39312,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39068,25 +39389,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39099,31 +39420,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39137,85 +39458,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39226,13 +39547,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39243,13 +39564,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39260,73 +39581,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39337,19 +39658,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39359,67 +39680,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39433,25 +39754,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39462,7 +39783,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39472,7 +39793,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39481,55 +39802,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39540,13 +39861,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39554,7 +39875,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39566,7 +39887,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39575,37 +39896,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42177,7 +42498,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43910,223 +44231,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46655,7 +46973,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46665,6 +46983,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46672,97 +46991,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46770,139 +47059,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46911,31 +47296,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46947,13 +47332,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46968,13 +47353,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46986,19 +47371,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47013,19 +47398,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47034,7 +47419,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48014,7 +48399,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48192,7 +48577,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48470,19 +48855,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51110,7 +51501,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -51548,311 +51939,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51861,7 +52264,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51871,613 +52274,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52492,523 +52931,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53988,7 +54427,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58329,7 +58780,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, fuzzy, priority:260
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
@@ -58764,185 +59215,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58952,7 +59415,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58962,13 +59425,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 128ff80..78408a3 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2019-10-31 12:31+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -76,7 +76,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -274,7 +274,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -706,7 +706,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1653,8 +1653,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2449,61 +2449,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3537,7 +3537,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,13 +3549,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4048,7 +4048,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4084,7 +4084,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4104,7 +4104,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4716,15 +4716,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4854,13 +4854,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4896,7 +4896,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4938,13 +4938,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4956,7 +4956,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5004,13 +5004,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5354,7 +5354,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5372,7 +5372,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5396,253 +5396,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5683,7 +5683,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5725,13 +5725,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5743,7 +5743,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5761,13 +5761,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5791,13 +5791,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5971,43 +5971,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6049,7 +6049,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6373,13 +6373,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6407,7 +6407,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6429,7 +6429,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6471,7 +6471,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6501,7 +6501,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6593,37 +6593,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6683,7 +6683,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6695,7 +6695,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6707,7 +6707,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6719,19 +6719,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6743,7 +6743,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6797,115 +6797,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6991,7 +6992,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7021,8 +7022,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7033,7 +7034,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7105,7 +7106,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7128,8 +7129,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7321,7 +7322,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7351,7 +7352,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7491,7 +7492,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7681,7 +7682,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9243,7 +9244,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9267,7 +9268,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9555,7 +9556,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9679,7 +9680,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10092,7 +10093,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10128,7 +10129,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10347,7 +10348,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10671,13 +10672,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10767,7 +10768,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10918,127 +10919,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11514,7 +11521,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11706,7 +11713,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11892,7 +11899,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12628,7 +12635,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12652,7 +12659,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12878,7 +12885,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13444,7 +13451,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13588,7 +13595,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13684,7 +13691,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13982,7 +13989,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14042,89 +14049,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14331,7 +14314,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14427,7 +14410,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14730,13 +14713,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14746,13 +14729,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14761,19 +14744,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14783,31 +14766,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14817,55 +14800,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14886,18 +14923,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15078,7 +15115,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15337,204 +15374,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15545,7 +15594,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15555,7 +15604,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15565,7 +15614,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15575,7 +15624,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15587,157 +15636,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15747,13 +15796,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15766,19 +15815,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15786,13 +15835,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15879,7 +15928,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19212,7 +19261,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22483,7 +22532,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22872,7 +22921,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23631,7 +23680,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24250,7 +24299,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26014,7 +26063,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26384,7 +26433,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26460,575 +26509,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27066,7 +27133,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30580,7 +30647,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30646,7 +30713,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30771,97 +30838,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30882,7 +30949,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31390,7 +31457,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33261,7 +33328,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36145,13 +36212,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38295,7 +38362,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38325,487 +38392,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38813,27 +38947,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38841,157 +38977,342 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, fuzzy, priority:100
#| msgid "`commit`"
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, fuzzy, priority:100
#| msgid "--independent"
msgid "independent fixup"
msgstr "--independent"
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, fuzzy, priority:100
#| msgid "`commit`"
msgid "commit it"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39000,73 +39321,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39077,25 +39398,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39108,31 +39429,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39146,85 +39467,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39235,13 +39556,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39252,13 +39573,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39269,73 +39590,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39346,19 +39667,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39368,67 +39689,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39442,25 +39763,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39471,7 +39792,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39481,7 +39802,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39490,55 +39811,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39549,13 +39870,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39563,7 +39884,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39575,7 +39896,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39584,37 +39905,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42204,7 +42525,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43949,224 +44270,221 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, fuzzy, priority:280
#| msgid "linkgit:git-add[1]"
msgid "See linkgit:git-add[1]."
msgstr "linkgit:git-add[1]"
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46712,7 +47030,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46722,6 +47040,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46729,97 +47048,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46827,139 +47116,236 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, fuzzy, no-wrap, priority:240
+#| msgid "--start"
+msgid "<stash>"
+msgstr "--start"
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46968,31 +47354,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -47004,13 +47390,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47025,13 +47411,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47043,19 +47429,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47070,19 +47456,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47091,7 +47477,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48077,7 +48463,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48256,7 +48642,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48534,19 +48920,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51192,7 +51584,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, fuzzy, no-wrap, priority:240
#| msgid "`commit`"
msgid "<commit>"
@@ -51635,314 +52027,326 @@ msgstr "--stdin-paths"
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, fuzzy, no-wrap, priority:100
#| msgid "--worktree"
msgid "--work-tree=<path>"
msgstr "--worktree"
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, fuzzy, no-wrap, priority:100
#| msgid "--unsafe-paths"
msgid "--namespace=<path>"
msgstr "--unsafe-paths"
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, fuzzy, no-wrap, priority:100
#| msgid "--user-path"
msgid "--super-prefix=<path>"
msgstr "--user-path"
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51951,7 +52355,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51961,617 +52365,652 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, fuzzy, no-wrap, priority:100
#| msgid "`blob`"
msgid "<blob>"
msgstr "`blob`"
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, fuzzy, no-wrap, priority:100
#| msgid "--no-commit-id"
msgid "<commit-ish>"
msgstr "--no-commit-id"
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
-#, fuzzy, priority:100
-#| msgid "linkgit:git-commit-tree[1]"
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "linkgit:git-commit-tree[1]"
+#: en/git.txt:529
+#, priority:100
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, fuzzy, priority:100
#| msgid "--no-where"
msgid "where:"
msgstr "--no-where"
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52586,524 +53025,524 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, fuzzy, no-wrap, priority:100
#| msgid "`author`"
msgid "Authors"
msgstr "`author`"
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, fuzzy, priority:100
#| msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
@@ -54086,7 +54525,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58438,7 +58889,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, fuzzy, priority:260
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
@@ -58873,185 +59324,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -59061,7 +59524,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -59071,13 +59534,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -62080,3 +62543,7 @@ msgstr ""
#, priority:300
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+
+#, fuzzy
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 375c513..0035fe2 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-04-03 02:31+0000\n"
"Last-Translator: Michal Biesiada <blade-14@o2.pl>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,8 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.0-dev\n"
#. type: Labeled list
@@ -31,7 +30,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -79,7 +78,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -91,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -127,7 +126,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -277,7 +276,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -709,7 +708,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1656,8 +1655,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2452,61 +2451,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3540,7 +3539,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3552,13 +3551,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4019,7 +4018,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4051,7 +4050,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4087,7 +4086,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4107,7 +4106,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4719,15 +4718,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4857,13 +4856,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4899,7 +4898,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4941,13 +4940,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, fuzzy, no-wrap, priority:280
msgid "-W"
msgstr "-W"
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4959,7 +4958,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4971,7 +4970,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5007,13 +5006,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5103,7 +5102,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5235,7 +5234,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5247,13 +5246,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5285,7 +5284,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5357,7 +5356,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5375,7 +5374,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5399,253 +5398,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5686,7 +5685,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "OPIS"
@@ -5728,13 +5727,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OPCJE"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5746,7 +5745,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5764,13 +5763,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5794,13 +5793,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5974,43 +5973,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr "--pathspec-from-file=<file>"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "PRZYK흟ADY"
@@ -6052,7 +6051,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "TRYB INTERAKTYWNY"
@@ -6364,7 +6363,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "ZOBACZ TAK탈E"
@@ -6376,13 +6375,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6410,7 +6409,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6432,7 +6431,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6474,7 +6473,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6504,7 +6503,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6596,37 +6595,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6686,7 +6685,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6698,7 +6697,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6710,7 +6709,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6722,19 +6721,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6746,7 +6745,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6800,115 +6799,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr "DYSKUSJA"
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6994,7 +6994,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7024,8 +7024,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7036,7 +7036,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7108,7 +7108,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7131,8 +7131,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7324,7 +7324,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr "KONFIGURACJA"
@@ -7354,7 +7354,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7494,7 +7494,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7684,7 +7684,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9246,7 +9246,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9270,7 +9270,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9558,7 +9558,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9682,7 +9682,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10095,7 +10095,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10131,7 +10131,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10350,7 +10350,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10674,13 +10674,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10770,7 +10770,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10921,127 +10921,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11517,7 +11523,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11709,7 +11715,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11895,7 +11901,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12631,7 +12637,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12655,7 +12661,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12881,7 +12887,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13447,7 +13453,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13591,7 +13597,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13687,7 +13693,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13988,7 +13994,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14048,89 +14054,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr "PLIKI"
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14337,7 +14319,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14433,7 +14415,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14736,13 +14718,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14752,13 +14734,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14767,19 +14749,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, fuzzy, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14793,31 +14775,31 @@ msgstr ""
"$ git commit Makefile\n"
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, fuzzy, no-wrap, priority:280
msgid "$ git commit\n"
msgstr "$ git commit\n"
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14827,55 +14809,110 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, fuzzy, no-wrap, priority:280
+#| msgid "CONFIGURATION"
+msgid "COMMIT INFORMATION"
+msgstr "KONFIGURACJA"
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14896,18 +14933,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15088,7 +15125,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15347,204 +15384,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15555,7 +15604,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15565,7 +15614,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15575,7 +15624,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15585,7 +15634,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15597,157 +15646,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15757,13 +15806,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15776,19 +15825,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15796,13 +15845,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15889,7 +15938,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, fuzzy, no-wrap, priority:100
msgid "-H"
msgstr "-H"
@@ -19222,7 +19271,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22496,7 +22545,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22885,7 +22934,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr "do"
@@ -23644,7 +23693,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24263,7 +24312,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26027,7 +26076,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26397,7 +26446,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26473,575 +26522,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr "( ... )"
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27079,7 +27146,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30593,7 +30660,7 @@ msgid "?"
msgstr "?"
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr "inne"
@@ -30659,7 +30726,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30784,97 +30851,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30895,7 +30962,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31403,7 +31470,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33274,7 +33341,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36155,13 +36222,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38310,7 +38377,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38340,487 +38407,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38828,27 +38962,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38856,154 +38992,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39012,73 +39333,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39089,25 +39410,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39120,31 +39441,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39158,85 +39479,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39247,13 +39568,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39264,13 +39585,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39281,73 +39602,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39358,19 +39679,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39380,67 +39701,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39454,25 +39775,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39483,7 +39804,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39493,7 +39814,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39502,55 +39823,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39561,13 +39882,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39575,7 +39896,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39587,7 +39908,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39596,37 +39917,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42198,7 +42519,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43930,223 +44251,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, fuzzy, no-wrap, priority:280
msgid "git add -A\n"
msgstr "git add -A\n"
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, fuzzy, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr "`git rm -f git-*.sh`"
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46675,7 +46993,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46685,6 +47003,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46692,97 +47011,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46790,139 +47079,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, fuzzy, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46934,31 +47319,31 @@ msgstr ""
" -----H----I\n"
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46970,13 +47355,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46991,13 +47376,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47009,19 +47394,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47036,19 +47421,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47057,7 +47442,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48037,7 +48422,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48215,7 +48600,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48492,19 +48877,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51127,7 +51518,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -51565,311 +51956,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51878,7 +52281,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51888,613 +52291,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr "Ca흢kowita liczba 힄cie탉ek."
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52509,523 +52948,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -54005,7 +54444,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58338,7 +58789,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58766,185 +59217,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58954,7 +59417,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58964,13 +59427,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
diff --git a/po/documentation.pot b/po/documentation.pot
index dd85de5..30a274b 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, no-wrap
msgid "--root"
msgstr ""
@@ -80,7 +80,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, no-wrap
msgid "-l"
msgstr ""
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, no-wrap
msgid "-t"
msgstr ""
@@ -129,7 +129,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, no-wrap
msgid "-p"
msgstr ""
@@ -320,7 +320,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, no-wrap
msgid "-h"
msgstr ""
@@ -716,7 +716,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, no-wrap
msgid "linkgit:git-add[1]"
msgstr ""
@@ -1584,8 +1584,8 @@ msgstr ""
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, no-wrap
msgid "linkgit:git-write-tree[1]"
msgstr ""
@@ -2439,15 +2439,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
msgid ""
"The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, "
"`blue`, `magenta`, `cyan` and `white`. The first color given is the "
-"foreground; the second is the background."
+"foreground; the second is the background. All the basic colors except "
+"`normal` have a bright variant that can be speficied by prefixing the color "
+"with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
msgid ""
"Colors may also be given as numbers between 0 and 255; these use ANSI "
"256-color mode (but note that not all terminals may support this). If your "
@@ -2456,7 +2458,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
msgid ""
"The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, "
"`italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The "
@@ -2466,14 +2468,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
msgid ""
"An empty color string produces no color effect at all. This can be used to "
"avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
msgid ""
"For git's pre-defined color slots, the attributes are meant to be reset at "
"the beginning of each item in the colored output. So setting "
@@ -2486,13 +2488,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
msgid ""
"A variable that takes a pathname value can be given a string that begins "
"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such "
@@ -2501,13 +2503,13 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
msgid ""
"Note that this list is non-comprehensive and not necessarily complete. For "
"command-specific variables, you will find a more detailed description in the "
@@ -2515,7 +2517,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
msgid ""
"Other git-related tools may and do use their own variables. When inventing "
"new variables for use in your own tool, make sure their names do not "
@@ -3637,7 +3639,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, no-wrap
msgid "--no-stat"
msgstr ""
@@ -3648,13 +3650,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, no-wrap
msgid "-u"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, no-wrap
msgid "--patch"
msgstr ""
@@ -4153,7 +4155,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, no-wrap
msgid "-z"
msgstr ""
@@ -4188,7 +4190,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, no-wrap
msgid "--name-only"
msgstr ""
@@ -4232,7 +4234,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap
msgid "--color[=<when>]"
msgstr ""
@@ -4253,7 +4255,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, no-wrap
msgid "--no-color"
msgstr ""
@@ -4963,16 +4965,16 @@ msgstr ""
#: en/diff-options.txt:573
#, no-wrap
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
msgid ""
-"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log "
-"-S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
+"While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log "
+"-S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of "
"occurrences of that string did not change)."
msgstr ""
@@ -5125,13 +5127,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, no-wrap
msgid "-a"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, no-wrap
msgid "--text"
msgstr ""
@@ -5165,7 +5167,7 @@ msgid "--ignore-space-change"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, no-wrap
msgid "-w"
msgstr ""
@@ -5209,13 +5211,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, no-wrap
msgid "--function-context"
msgstr ""
@@ -5226,7 +5228,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, no-wrap
msgid "--exit-code"
msgstr ""
@@ -5239,7 +5241,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, no-wrap
msgid "--quiet"
msgstr ""
@@ -5275,13 +5277,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, no-wrap
msgid "--textconv"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, no-wrap
msgid "--no-textconv"
msgstr ""
@@ -5389,7 +5391,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, no-wrap
msgid "--all"
msgstr ""
@@ -5544,7 +5546,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, no-wrap
msgid "--dry-run"
msgstr ""
@@ -5555,13 +5557,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, no-wrap
msgid "-f"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, no-wrap
msgid "--force"
msgstr ""
@@ -5594,7 +5596,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, no-wrap
msgid "-k"
msgstr ""
@@ -5674,7 +5676,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap
msgid "-P"
msgstr ""
@@ -5696,7 +5698,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, no-wrap
msgid "-n"
msgstr ""
@@ -5723,23 +5725,25 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
msgid ""
"When fetching refs listed on the command line, use the specified refspec "
"(can be given more than once) to map the refs to remote-tracking branches, "
"instead of the values of `remote.*.fetch` configuration variables for the "
-"remote repository. See section on \"Configured Remote-tracking Branches\" "
-"for details."
+"remote repository. Providing an empty `<refspec>` to the `--refmap` option "
+"causes Git to ignore the configured refspecs and rely entirely on the "
+"refspecs supplied as command-line arguments. See section on \"Configured "
+"Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, no-wrap
msgid "--tags"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
msgid ""
"Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into "
"local tags with the same name), in addition to whatever else would otherwise "
@@ -5749,13 +5753,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
msgid ""
"This option controls if and under what conditions new commits of populated "
"submodules should be fetched too. It can be used as a boolean option to "
@@ -5768,24 +5772,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, no-wrap
msgid "-j"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
msgid ""
"If the `--multiple` option was specified, the different remotes will be "
"fetched in parallel. If multiple submodules are fetched, they will be "
@@ -5794,33 +5798,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
msgid ""
"Typically, parallel recursive and multi-remote fetches will be faster. By "
"default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, no-wrap
msgid "--no-recurse-submodules"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
msgid ""
"Disable recursive fetching of submodules (this has the same effect as using "
"the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, no-wrap
msgid "--set-upstream"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
msgid ""
"If the remote is fetched successfully, pull and add upstream (tracking) "
"reference, used by argument-less linkgit:git-pull[1] and other commands. For "
@@ -5829,13 +5833,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
msgid ""
"Prepend <path> to paths printed in informative messages such as \"Fetching "
"submodule foo\". This option is used internally when recursing over "
@@ -5843,13 +5847,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
msgid ""
"This option is used internally to temporarily provide a non-negative default "
"value for the --recurse-submodules option. All other methods of configuring "
@@ -5859,13 +5863,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, no-wrap
msgid "--update-head-ok"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
msgid ""
"By default 'git fetch' refuses to update the head which corresponds to the "
"current branch. This flag disables the check. This is purely for the "
@@ -5874,13 +5878,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
msgid ""
"When given, and the repository to fetch from is handled by 'git fetch-pack', "
"`--exec=<upload-pack>` is passed to the command to specify non-default path "
@@ -5888,43 +5892,43 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, no-wrap
msgid "-q"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
msgid ""
"Pass --quiet to git-fetch-pack and silence any other internally used git "
"commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, no-wrap
msgid "-v"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, no-wrap
msgid "--verbose"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, no-wrap
msgid "--progress"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
msgid ""
"Progress status is reported on the standard error stream by default when it "
"is attached to a terminal, unless -q is specified. This flag forces progress "
@@ -5932,19 +5936,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
msgid ""
"Transmit the given string to the server when communicating using protocol "
"version 2. The given string must not contain a NUL or LF character. The "
@@ -5954,13 +5958,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, no-wrap
msgid "--show-forced-updates"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
msgid ""
"By default, git checks if a branch is force-updated during fetch. This can "
"be disabled through fetch.showForcedUpdates, but the --show-forced-updates "
@@ -5968,13 +5972,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, no-wrap
msgid "--no-show-forced-updates"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
msgid ""
"By default, git checks if a branch is force-updated during fetch. Pass "
"--no-show-forced-updates or set fetch.showForcedUpdates to false to skip "
@@ -5984,36 +5988,36 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, no-wrap
msgid "-4"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, no-wrap
msgid "--ipv4"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, no-wrap
msgid "-6"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, no-wrap
msgid "--ipv6"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -6054,7 +6058,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
@@ -6115,13 +6119,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, no-wrap
msgid "<pathspec>..."
msgstr ""
@@ -6141,7 +6145,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
msgid ""
"For more details about the <pathspec> syntax, see the 'pathspec' entry in "
"linkgit:gitglossary[7]."
@@ -6160,13 +6164,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, no-wrap
msgid "-i"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, no-wrap
msgid "--interactive"
msgstr ""
@@ -6196,13 +6200,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, no-wrap
msgid "-e"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, no-wrap
msgid "--edit"
msgstr ""
@@ -6410,13 +6414,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
msgid ""
"Pathspec is passed in `<file>` instead of commandline args. If `<file>` is "
"exactly `-` then standard input is used. Pathspec elements are separated by "
@@ -6426,13 +6430,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, no-wrap
msgid "--pathspec-file-nul"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
msgid ""
"Only meaningful with `--pathspec-from-file`. Pathspec elements are separated "
"with NUL character and all other characters are taken literally (including "
@@ -6440,20 +6444,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
msgid ""
"This option can be used to separate command-line options from the list of "
"files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap
msgid "EXAMPLES"
msgstr ""
@@ -6498,7 +6502,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6857,7 +6861,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -6870,13 +6874,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6902,7 +6906,8 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | "
+"--show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6927,7 +6932,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, no-wrap
msgid "--signoff"
msgstr ""
@@ -6972,7 +6977,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, no-wrap
msgid "-c"
msgstr ""
@@ -7003,7 +7008,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, no-wrap
msgid "-m"
msgstr ""
@@ -7103,38 +7108,38 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, no-wrap
msgid "--rerere-autoupdate"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, no-wrap
msgid "--no-rerere-autoupdate"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
msgid ""
"Allow the rerere mechanism to update the index with the result of "
"auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, no-wrap
msgid "--ignore-whitespace"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap
msgid "-C<n>"
msgstr ""
@@ -7197,7 +7202,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, no-wrap
msgid "--committer-date-is-author-date"
msgstr ""
@@ -7212,7 +7217,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, no-wrap
msgid "--ignore-date"
msgstr ""
@@ -7227,7 +7232,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, no-wrap
msgid "--skip"
msgstr ""
@@ -7240,19 +7245,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
msgid ""
"GPG-sign commits. The `keyid` argument is optional and defaults to the "
"committer identity; if specified, it must be stuck to the option without a "
@@ -7266,7 +7271,7 @@ msgid "--continue"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, no-wrap
msgid "-r"
msgstr ""
@@ -7324,26 +7329,27 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
+#: en/git-am.txt:179
#, no-wrap
-msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
msgid ""
-"Show the entire e-mail message \"git am\" has stopped at, because of "
-"conflicts."
+"Show the message at which `git am` has stopped due to conflicts. If `raw` "
+"is specified, show the raw contents of the e-mail message; if `diff`, show "
+"the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
msgid ""
"The commit author name is taken from the \"From: \" line of the message, and "
"commit author date is taken from the \"Date: \" line of the message. The "
@@ -7353,14 +7359,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
msgid ""
"\"From: \", \"Date: \", and \"Subject: \" lines starting the body override "
"the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
msgid ""
"The commit message is formed by the title taken from the \"Subject: \", a "
"blank line and the body of the message up to where the patch begins. Excess "
@@ -7368,36 +7374,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
msgid ""
"The patch is expected to be inline, directly following the message. Any "
"line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
msgid ""
"is taken as the beginning of a patch, and the commit log message is "
"terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
msgid ""
"When initially invoking `git am`, you give it the names of the mailboxes to "
"process. Upon seeing the first patch that does not apply, it aborts in the "
@@ -7405,12 +7411,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
msgid ""
"hand resolve the conflict in the working directory, and update the index "
"file to bring it into a state that the patch should have produced. Then run "
@@ -7418,7 +7424,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
msgid ""
"The command refuses to process new mailboxes until the current operation is "
"finished, so if you decide to start over from scratch, run `git am --abort` "
@@ -7426,7 +7432,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
msgid ""
"Before any patches are applied, ORIG_HEAD is set to the tip of the current "
"branch. This is useful if you have problems with multiple commits, like "
@@ -7435,20 +7441,20 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
msgid ""
"This command can run `applypatch-msg`, `pre-applypatch`, and "
"`post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
msgid "linkgit:git-apply[1]."
msgstr ""
@@ -7544,7 +7550,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, no-wrap
msgid "--stat"
msgstr ""
@@ -7581,7 +7587,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
#, no-wrap
msgid "--index"
msgstr ""
@@ -7597,7 +7603,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, no-wrap
msgid "--cached"
msgstr ""
@@ -7689,7 +7695,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
msgid ""
"Ensure at least <n> lines of surrounding context match before and after each "
"change. When fewer lines of surrounding context exist they all must match. "
@@ -7718,8 +7724,8 @@ msgid ""
"discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, no-wrap
msgid "--apply"
msgstr ""
@@ -7954,7 +7960,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap
msgid "CONFIGURATION"
msgstr ""
@@ -7987,7 +7993,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap
msgid "SUBMODULES"
msgstr ""
@@ -8160,7 +8166,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, no-wrap
msgid "-o"
msgstr ""
@@ -8366,7 +8372,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap
msgid "<tree-ish>"
msgstr ""
@@ -10148,7 +10154,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap
msgid "-C"
msgstr ""
@@ -10173,7 +10179,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, no-wrap
msgid "--ignore-case"
msgstr ""
@@ -10495,7 +10501,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -10635,7 +10641,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -11140,7 +11146,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap
msgid "<object>"
msgstr ""
@@ -11176,7 +11182,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap
msgid "<type>"
msgstr ""
@@ -11432,7 +11438,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap
msgid "OUTPUT"
msgstr ""
@@ -11780,13 +11786,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, no-wrap
msgid "--stdin"
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
msgid ""
"Read pathnames from the standard input, one per line, instead of from the "
"command-line."
@@ -11878,7 +11884,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
msgid ""
"Buffering happens as documented under the `GIT_FLUSH` option in "
"linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by "
@@ -12028,15 +12034,24 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+msgid ""
+"Instead of printing the paths that are excluded, for each path that matches "
+"an exclude pattern, print the exclude pattern together with the path. "
+"(Matching an exclude pattern usually means the path is excluded, but if the "
+"pattern begins with '!' then it is a negated pattern and matching it means "
+"the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
msgid ""
-"Also output details about the matching pattern (if any) for each given "
-"pathname. For precedence rules within and between exclude sources, see "
+"For precedence rules within and between exclude sources, see "
"linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
msgid ""
"The output format is modified to be machine-parsable (see below). If "
"`--stdin` is also given, input paths are separated with a NUL character "
@@ -12044,13 +12059,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
msgid ""
"Show given paths which don't match any pattern.\t This only makes sense when "
"`--verbose` is enabled, otherwise it would not be possible to distinguish "
@@ -12058,13 +12073,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, no-wrap
msgid "--no-index"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
msgid ""
"Don't look in the index when undertaking the checks. This can be used to "
"debug why a path became tracked by e.g. `git add .` and was not ignored by "
@@ -12073,7 +12088,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
msgid ""
"By default, any of the given pathnames which match an ignore pattern will be "
"output, one per line. If no pattern matches a given path, nothing will be "
@@ -12081,17 +12096,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
msgid ""
"<pathname> is the path of a file being queried, <pattern> is the matching "
"pattern, <source> is the pattern's source file, and <linenum> is the line "
@@ -12103,7 +12118,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
msgid ""
"If `-z` is specified, the pathnames in the output are delimited by the null "
"character; if `--verbose` is also specified then null characters are also "
@@ -12111,12 +12126,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
msgid ""
"If `-n` or `--non-matching` are specified, non-matching pathnames will also "
"be output, in which case all fields in each output record except for "
@@ -12130,46 +12145,46 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr ""
@@ -12720,7 +12735,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -12963,7 +12978,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, no-wrap
msgid "--merge"
msgstr ""
@@ -13187,7 +13202,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -14042,7 +14057,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, no-wrap
msgid "--allow-empty-message"
msgstr ""
@@ -14072,7 +14087,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap
msgid "--strategy=<strategy>"
msgstr ""
@@ -14323,7 +14338,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap
msgid "<head>"
msgstr ""
@@ -14972,7 +14987,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, no-wrap
msgid "--bare"
msgstr ""
@@ -15151,7 +15166,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, no-wrap
msgid "--[no-]single-branch"
msgstr ""
@@ -15273,7 +15288,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap
msgid "<repository>"
msgstr ""
@@ -15582,7 +15597,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap
msgid "<tree>"
msgstr ""
@@ -15644,68 +15659,33 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-msgid ""
-"While parent object ids are provided on the command line, author and "
-"committer information is taken from the following environment variables, if "
-"set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-msgid ""
-"In case (some of) these environment variables are not set, the information "
-"is taken from the configuration items user.name and user.email, or, if not "
-"present, the environment variable EMAIL, or, if that is not set, system user "
-"name and the hostname used for outgoing mail (taken from `/etc/mailname` and "
-"falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
msgid ""
"A commit comment is read from stdin. If a changelog entry is not provided "
"via \"<\" redirection, 'git commit-tree' will just wait for one to be "
@@ -15713,22 +15693,27 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr ""
+
#. type: Title =
#: en/git-commit.txt:2
#, no-wrap
@@ -15966,7 +15951,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, no-wrap
msgid "--null"
msgstr ""
@@ -16080,7 +16065,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, no-wrap
msgid "--no-verify"
msgstr ""
@@ -16428,7 +16413,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
msgid ""
"When recording your own work, the contents of modified files in your working "
"tree are temporarily stored to a staging area called the \"index\" with 'git "
@@ -16442,7 +16427,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap
msgid ""
"$ edit hello.c\n"
@@ -16452,7 +16437,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
msgid ""
"Instead of staging files after each individual change, you can tell `git "
"commit` to notice the changes to the files whose contents are tracked in "
@@ -16462,7 +16447,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap
msgid ""
"$ edit hello.c\n"
@@ -16471,7 +16456,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
msgid ""
"The command `git commit -a` first looks at your working tree, notices that "
"you have modified hello.c and removed goodbye.c, and performs necessary `git "
@@ -16479,7 +16464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
msgid ""
"After staging changes to many files, you can alter the order the changes are "
"recorded in, by giving pathnames to `git commit`. When pathnames are given, "
@@ -16488,7 +16473,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap
msgid ""
"$ edit hello.c hello.h\n"
@@ -16498,7 +16483,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
msgid ""
"This makes a commit that records the modification to `Makefile`. The "
"changes staged for `hello.c` and `hello.h` are not included in the resulting "
@@ -16507,20 +16492,20 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
msgid ""
"this second commit would record the changes to `hello.c` and `hello.h` as "
"expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
msgid ""
"After a merge (initiated by 'git merge' or 'git pull') stops because of "
"conflicts, cleanly merged paths are already staged to be committed for you, "
@@ -16531,7 +16516,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap
msgid ""
"$ git status | grep unmerged\n"
@@ -16541,7 +16526,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
msgid ""
"After resolving conflicts and staging the result, `git ls-files -u` would "
"stop mentioning the conflicted path. When you are done, run `git commit` to "
@@ -16549,7 +16534,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
msgid ""
"As with the case to record your own changes, you can use `-a` option to save "
"typing. One difference is that during a merge resolution, you cannot use "
@@ -16558,8 +16543,75 @@ msgid ""
"command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+msgid ""
+"Author and committer information is taken from the following environment "
+"variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+msgid ""
+"The author and committer names are by convention some form of a personal "
+"name (that is, the name by which other humans refer to you), although Git "
+"does not enforce or require any particular form. Arbitrary Unicode may be "
+"used, subject to the constraints listed above. This name has no effect on "
+"authentication; for that, see the `credential.username` variable in "
+"linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+msgid ""
+"In case (some of) these environment variables are not set, the information "
+"is taken from the configuration items `user.name` and `user.email`, or, if "
+"not present, the environment variable EMAIL, or, if that is not set, system "
+"user name and the hostname used for outgoing mail (taken from "
+"`/etc/mailname` and falling back to the fully qualified hostname when that "
+"file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+msgid ""
+"The `author.name` and `committer.name` and their corresponding email options "
+"override `user.name` and `user.email` if set and are overridden themselves "
+"by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+msgid ""
+"The typical usage is to set just the `user.name` and `user.email` variables; "
+"the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
msgid ""
"Though not required, it's a good idea to begin the commit message with a "
"single short (less than 50 character) line summarizing the change, followed "
@@ -16571,13 +16623,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
msgid ""
"The editor used to edit the commit log message will be chosen from the "
"`GIT_EDITOR` environment variable, the core.editor configuration variable, "
@@ -16586,7 +16638,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
msgid ""
"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
"`post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
@@ -16594,13 +16646,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
msgid ""
"This file contains the commit message of a commit in progress. If `git "
"commit` exits due to an error before creating a commit, any commit message "
@@ -16610,7 +16662,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
msgid ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], "
"linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -16631,25 +16683,25 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] "
-"name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] "
+"[-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value "
"[value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] "
-"--get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] "
-"--get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] "
-"[--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] "
+"[-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] "
+"[-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] "
+"[-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name "
"URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | "
-"--list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] "
+"[--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -16852,7 +16904,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
msgid "See also <<FILES>>."
msgstr ""
@@ -17133,11 +17185,25 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
#, no-wrap
+msgid "--show-scope"
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:229
+msgid ""
+"Similar to `--show-origin` in that it augments the output of all queried "
+"config options with the scope of that value (local, global, system, "
+"command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
+#, no-wrap
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
msgid ""
"Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or "
"\"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is "
@@ -17149,13 +17215,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
msgid ""
"Find the color configured for `name` (e.g. `color.diff.new`) and output it "
"as the ANSI color escape sequence to the standard output. The optional "
@@ -17164,7 +17230,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
msgid ""
"`--type=color [--default=<default>]` is preferred over `--get-color` (but "
"note that `--get-color` will omit the trailing newline printed by "
@@ -17172,20 +17238,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
msgid ""
"Opens an editor to modify the specified config file; either `--system`, "
"`--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, no-wrap
msgid "--[no-]includes"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
msgid ""
"Respect `include.*` directives in config files when looking up "
"values. Defaults to `off` when a specific file is given (e.g., using "
@@ -17193,20 +17259,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
msgid ""
"When using `--get`, and the requested variable is not found, behave as if "
"<value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
msgid ""
"`pager.config` is only respected when listing configuration, i.e., when "
"using `--list` or any of the `--get-*` which may return multiple results. "
@@ -17214,31 +17280,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
msgid ""
"If not set explicitly with `--file`, there are four files where 'git config' "
"will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
msgid ""
"Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or "
"empty, `$HOME/.config/git/config` will be used. Any single-valued variable "
@@ -17248,42 +17314,42 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
msgid ""
"This is optional and is only searched when `extensions.worktreeConfig` is "
"present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
msgid ""
"If no further options are given, all reading options will read all of these "
"files that are available. If the global or the system-wide configuration "
@@ -17293,7 +17359,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
msgid ""
"The files are read in the order given above, with last value found taking "
"precedence over values read earlier. When multiple values are taken then "
@@ -17301,14 +17367,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
msgid ""
"You may override individual configuration parameters when running any git "
"command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
msgid ""
"All writing options will per default write to the repository specific "
"configuration file. Note that this also affects options like `--replace-all` "
@@ -17316,7 +17382,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
msgid ""
"You can override these rules either by command-line options or by "
"environment variables. The `--global`, `--system` and `--worktree` options "
@@ -17326,19 +17392,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, no-wrap
msgid "GIT_CONFIG"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
msgid ""
"Take the configuration from the given file instead of .git/config. Using "
"the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" "
@@ -17346,25 +17412,25 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, no-wrap
msgid "GIT_CONFIG_NOSYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
msgid ""
"Whether to skip reading settings from the system-wide "
"$(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap
msgid ""
"#\n"
@@ -17375,7 +17441,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap
msgid ""
"; core variables\n"
@@ -17385,7 +17451,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap
msgid ""
"; Our diff algorithm\n"
@@ -17395,7 +17461,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap
msgid ""
"; Proxy settings\n"
@@ -17405,7 +17471,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap
msgid ""
"; HTTP\n"
@@ -17417,18 +17483,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
msgid ""
"The hypothetical proxy command entries actually have a postfix to discern "
"what URL they apply to. Here is how to change the entry for kernel.org to "
@@ -17436,133 +17502,133 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
msgid ""
"If you want to delete an entry for a multivar (like core.gitproxy above), "
"you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
msgid ""
"If you like to live dangerously, you can replace *all* core.gitproxy by a "
"new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
msgid ""
"However, if you really only want to replace the line for the default proxy, "
"i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap
msgid ""
"#!/bin/sh\n"
@@ -17572,14 +17638,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
msgid ""
"For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, "
"while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify "
@@ -17594,13 +17660,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
msgid ""
"When using the deprecated `[section.subsection]` syntax, changing a value "
"will result in adding a multi-line key instead of a change, if the "
@@ -17609,7 +17675,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap
msgid ""
" [section.subsection]\n"
@@ -17617,12 +17683,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap
msgid ""
" [section.subsection]\n"
@@ -17712,7 +17778,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap
msgid "-H"
msgstr ""
@@ -21552,7 +21618,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, no-wrap
msgid "<path>..."
msgstr ""
@@ -25531,7 +25597,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, no-wrap
msgid "<refs>..."
msgstr ""
@@ -25989,7 +26055,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap
msgid "to"
msgstr ""
@@ -26905,10 +26971,10 @@ msgstr ""
#: en/git-filter-branch.txt:473
msgid ""
"In editing files, git-filter-branch by design checks out each and every "
-"commit as it existed in the original repo. If your repo has 10\\^5 files "
-"and 10\\^5 commits, but each commit only modifies 5 files, then "
-"git-filter-branch will make you do 10\\^10 modifications, despite only "
-"having (at most) 5*10^5 unique blobs."
+"commit as it existed in the original repo. If your repo has `10^5` files "
+"and `10^5` commits, but each commit only modifies five files, then "
+"git-filter-branch will make you do `10^10` modifications, despite only "
+"having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -27724,7 +27790,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap
msgid "HEAD"
msgstr ""
@@ -29779,7 +29845,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap
msgid "Environment Variables"
msgstr ""
@@ -30218,8 +30284,8 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
msgid ""
-"Number of grep worker threads to use. If unset (or set to 0), 8 threads are "
-"used by default (for now)."
+"Number of grep worker threads to use. If unset (or set to 0), Git will use "
+"as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -30299,53 +30365,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
msgid ""
"Recursively search in each submodule that has been initialized and checked "
"out in the repository. When used in combination with the <tree> option the "
"prefix of all submodule output will be the name of the parent project's "
-"<tree> object."
+"<tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
msgid ""
"For each <pathspec> given on command line, descend at most <depth> levels of "
"directories. A value of -1 means no limit. This option is ignored if "
@@ -30355,35 +30421,35 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, no-wrap
msgid "--recursive"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, no-wrap
msgid "--no-recursive"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, no-wrap
msgid "--word-regexp"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
msgid ""
"Match the pattern only at word boundary (either begin at the beginning of a "
"line, or preceded by a non-word character; end at the end of a line or "
@@ -30391,18 +30457,18 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, no-wrap
msgid "--invert-match"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
msgid ""
"By default, the command shows the filename for each match. `-h` option is "
"used to suppress this output. `-H` is there for completeness and does not "
@@ -30410,13 +30476,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, no-wrap
msgid "--full-name"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
msgid ""
"When run from a subdirectory, the command usually outputs paths relative to "
"the current directory. This option forces paths to be output relative to "
@@ -30424,49 +30490,49 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, no-wrap
msgid "--extended-regexp"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, no-wrap
msgid "--basic-regexp"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
msgid ""
"Use POSIX extended/basic regexp for patterns. Default is to use basic "
"regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, no-wrap
msgid "--perl-regexp"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
msgid ""
"Support for these types of regular expressions is an optional compile-time "
"dependency. If Git wasn't compiled with support for them providing this "
@@ -30474,66 +30540,66 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, no-wrap
msgid "--fixed-strings"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, no-wrap
msgid "--line-number"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, no-wrap
msgid "--column"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
msgid ""
"Prefix the 1-indexed byte-offset of the first match from the start of the "
"matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, no-wrap
msgid "--files-with-matches"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, no-wrap
msgid "--files-without-match"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
msgid ""
"Instead of showing every matched line, show only the names of files that "
"contain (or do not contain) matches. For better compatibility with 'git "
@@ -30541,19 +30607,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
msgid ""
"Open the matching files in the pager (not the output of 'grep'). If the "
"pager happens to be \"less\" or \"vi\", and the user specified only one "
@@ -30564,80 +30630,80 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, no-wrap
msgid "--only-matching"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
msgid ""
"Print only the matched (non-empty) parts of a matching line, with each such "
"part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, no-wrap
msgid "--count"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
msgid ""
"Show colored matches. The value must be always (the default), never, or "
"auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
msgid ""
"Turn off match highlighting, even when the configuration file gives the "
"default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, no-wrap
msgid "--break"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, no-wrap
msgid "--heading"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
msgid ""
"Show the filename above the matches in that file instead of at the start of "
"each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, no-wrap
msgid "--show-function"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
msgid ""
"Show the preceding line that contains the function name of the match, unless "
"the matching line is a function name itself. The name is determined in the "
@@ -30646,70 +30712,70 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
msgid ""
"Show <num> leading and trailing lines, and place a line containing `--` "
"between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
msgid ""
"Show <num> trailing lines, and place a line containing `--` between "
"contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
msgid ""
"Show <num> leading lines, and place a line containing `--` between "
"contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
msgid ""
"Show the surrounding text from the previous line containing a function name "
"up to the one before the next function name, effectively showing the whole "
@@ -30717,38 +30783,38 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
msgid ""
"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' "
"for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
msgid ""
"Passing the pattern via <file> allows for providing a search pattern "
"containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
msgid ""
"Not all pattern types support patterns containing \\0. Git will error out if "
"a given pattern type can't support such a pattern. The `--perl-regexp` "
@@ -30757,7 +30823,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
msgid ""
"In versions of Git before 2.23.0 patterns containing \\0 would be silently "
"considered fixed. This was never documented, there were also odd and "
@@ -30766,7 +30832,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
msgid ""
"In future versions we may learn to support patterns containing \\0 for more "
"search backends, until then we'll die when the pattern type in question "
@@ -30774,7 +30840,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
msgid ""
"The next parameter is the pattern. This option has to be used for patterns "
"starting with `-` and should be used in scripts passing user input to grep. "
@@ -30782,31 +30848,31 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, no-wrap
msgid "--and"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, no-wrap
msgid "--or"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, no-wrap
msgid "--not"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, no-wrap
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
msgid ""
"Specify how multiple patterns are combined using Boolean expressions. "
"`--or` is the default operator. `--and` has higher precedence than `--or`. "
@@ -30814,100 +30880,123 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, no-wrap
msgid "--all-match"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
msgid ""
"When giving multiple pattern expressions combined with `--or`, this flag is "
"specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
msgid ""
"Do not output matched lines; instead, exit with status 0 when there is a "
"match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, no-wrap
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
msgid ""
"Instead of searching tracked files in the working tree, search blobs in the "
"given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
msgid ""
"Signals the end of options; the rest of the parameters are <pathspec> "
"limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
msgid ""
"If given, limit the search to paths matching at least one pattern. Both "
"leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
msgid ""
"Looks for `time_t` in all tracked .c and .h files in the working directory "
"and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
msgid ""
"Looks for a line that has `NODE` or `Unexpected` in files that have lines "
"that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+msgid ""
+"The `--threads` option (and the grep.threads configuration) will be ignored "
+"when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+msgid ""
+"When grepping the object store (with `--cached` or giving tree objects), "
+"running with multiple threads might perform slower than single threaded if "
+"`--textconv` is given and there're too many text conversions. So if you "
+"experience low performance in this case, it might be desirable to use "
+"`--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, no-wrap
@@ -30952,7 +31041,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -34849,7 +34938,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap
msgid "other"
msgstr ""
@@ -34931,7 +35020,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap
msgid "<file>"
msgstr ""
@@ -35073,37 +35162,39 @@ msgid "--heads"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
msgid ""
"Limit to only refs/heads and refs/tags, respectively. These options are "
"_not_ mutually exclusive; when given both, references stored in refs/heads "
-"and refs/tags are displayed."
+"and refs/tags are displayed. Note that `git ls-remote -h` used without "
+"anything else on the command line gives help, consistent with other git "
+"subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, no-wrap
msgid "--refs"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
msgid ""
"Specify the full path of 'git-upload-pack' on the remote host. This allows "
"listing references from repositories accessed via SSH and where the SSH "
@@ -35111,7 +35202,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
msgid ""
"Exit with status \"2\" when no matching refs are found in the remote "
"repository. Usually the command exits with status \"0\" to indicate it "
@@ -35120,13 +35211,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, no-wrap
msgid "--get-url"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
msgid ""
"Expand the URL of the given remote repository taking into account any "
"\"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit "
@@ -35134,13 +35225,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, no-wrap
msgid "--symref"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
msgid ""
"In addition to the object pointed by it, show the underlying ref pointed by "
"it when showing a symbolic ref. Currently, upload-pack only shows the "
@@ -35148,7 +35239,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
msgid ""
"Sort based on the key given. Prefix `-` to sort in descending order of the "
"value. Supports \"version:refname\" or \"v:refname\" (tag names are treated "
@@ -35161,7 +35252,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
msgid ""
"Transmit the given string to the server when communicating using protocol "
"version 2. The given string must not contain a NUL or LF character. When "
@@ -35170,7 +35261,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
msgid ""
"The \"remote\" repository to query. This parameter can be either a URL or "
"the name of a remote (see the GIT URLS and REMOTES sections of "
@@ -35178,7 +35269,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
msgid ""
"When unspecified, all references, after filtering done with --heads and "
"--tags, are shown. When <refs>... are specified, only references matching "
@@ -35186,7 +35277,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -35207,7 +35298,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
msgid "linkgit:git-check-ref-format[1]."
msgstr ""
@@ -35768,7 +35859,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, no-wrap
msgid "--fork-point"
msgstr ""
@@ -37942,7 +38033,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap
msgid "-s <strategy>"
msgstr ""
@@ -41300,13 +41391,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, no-wrap
msgid "--autostash"
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, no-wrap
msgid "--no-autostash"
msgstr ""
@@ -43914,7 +44005,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -43948,56 +44039,110 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+msgid ""
+"How to handle commits that are not empty to start and are not clean "
+"cherry-picks of any upstream commit, but which become empty after rebasing "
+"(because they contain a subset of already upstream changes). With drop (the "
+"default), commits that become empty are dropped. With keep, such commits "
+"are kept. With ask (implied by --interactive), the rebase will halt when an "
+"empty commit is applied allowing you to choose whether to drop it, edit "
+"files more, or just commit the empty changes. Other options, like --exec, "
+"will use the default of drop unless -i/--interactive is explicitly "
+"specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+msgid ""
+"Note that commits which start empty are kept, and commits which are clean "
+"cherry-picks (as determined by `git log --cherry-mark ...`) are always "
+"dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, no-wrap
msgid "--keep-empty"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:264
-msgid "Keep the commits that do not change anything from its parents in the result."
+#: en/git-rebase.txt:292
+msgid ""
+"No-op. Rebasing commits that started empty (had no change relative to their "
+"parent) used to fail and this option would override that behavior, allowing "
+"commits with empty changes to be rebased. Now commits with no changes do "
+"not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:294
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:300
msgid ""
-"By default, rebasing commits with an empty message will fail. This option "
-"overrides that behavior, allowing commits with empty messages to be rebased."
+"No-op. Rebasing commits with an empty message used to fail and this option "
+"would override that behavior, allowing commits with empty messages to be "
+"rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, no-wrap
msgid "--edit-todo"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, no-wrap
+msgid "--show-current-patch"
+msgstr ""
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
msgid ""
"Show the current patch in an interactive rebase or when rebase is stopped "
"because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
msgid ""
"Use merging strategies to rebase. When the recursive (default) merge "
"strategy is used, this allows rebase to be aware of renames on the upstream "
-"side."
+"side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
msgid ""
"Note that a rebase merge works by replaying each commit from the working "
"branch on top of the <upstream> branch. Because of this, when a merge "
@@ -44007,14 +44152,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
msgid ""
"Use the given merge strategy. If there is no `-s` option 'git "
"merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
msgid ""
"Because 'git rebase' replays each commit from the working branch on top of "
"the <upstream> branch using the given strategy, using the 'ours' strategy "
@@ -44022,19 +44167,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
msgid ""
"Pass the <strategy-option> through to the merge strategy. This implies "
"`--merge` and, if no strategy has been specified, `-s recursive`. Note the "
@@ -44042,59 +44187,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
msgid ""
"Show a diffstat of what changed upstream since the last rebase. The diffstat "
"is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, no-wrap
msgid "--verify"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
msgid ""
"Allows the pre-rebase hook to run, which is the default. This option can be "
"used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+msgid ""
+"Ensure at least <n> lines of surrounding context match before and after each "
+"change. When fewer lines of surrounding context exist they all must match. "
+"By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, no-wrap
msgid "--no-ff"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, no-wrap
msgid "--force-rebase"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
msgid ""
"Individually replay all rebased commits instead of fast-forwarding over the "
"unchanged ones. This ensures that the entire history of the rebased branch "
@@ -44102,7 +44255,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
msgid ""
"You may find this helpful after reverting a topic branch merge, as this "
"option recreates the topic branch with fresh commits so it can be remerged "
@@ -44112,20 +44265,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, no-wrap
msgid "--no-fork-point"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
msgid ""
"Use reflog to find a better common ancestor between <upstream> and <branch> "
"when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
msgid ""
"When --fork-point is active, 'fork_point' will be used instead of <upstream> "
"to calculate the set of commits to rebase, where 'fork_point' is the result "
@@ -44135,14 +44288,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
msgid ""
"If either <upstream> or --root is given on the command line, then the "
"default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
msgid ""
"If your branch was based on <upstream> but <upstream> was rewound and your "
"branch contains commits which were dropped, this option can be used with "
@@ -44150,21 +44303,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
msgid ""
-"These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) "
-"that applies the patch."
+"These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) "
+"that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
msgid ""
"These flags are passed to 'git am' to easily change the dates of the rebased "
"commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
msgid ""
"Add a Signed-off-by: trailer to all the rebased commits. Note that if "
"`--interactive` is given then only commits marked to be picked, edited or "
@@ -44172,7 +44325,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
msgid ""
"Make a list of the commits which are about to be rebased. Let the user edit "
"that list before rebasing. This mode can also be used to split commits (see "
@@ -44180,7 +44333,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
msgid ""
"The commit list format can be changed by setting the configuration option "
"rebase.instructionFormat. A customized instruction format will "
@@ -44188,13 +44341,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
msgid ""
"By default, a rebase will simply drop merge commits from the todo list, and "
"put the rebased commits into a single, linear branch. With "
@@ -44205,7 +44358,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
msgid ""
"By default, or when `no-rebase-cousins` was specified, commits which do not "
"have `<upstream>` as direct ancestor will keep their original branch point, "
@@ -44216,7 +44369,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
msgid ""
"The `--rebase-merges` mode is similar in spirit to the deprecated "
"`--preserve-merges` but works with interactive rebases, where commits can be "
@@ -44224,7 +44377,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
msgid ""
"It is currently only possible to recreate the merge commits using the "
"`recursive` merge strategy; Different merge strategies can be used only via "
@@ -44232,18 +44385,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, no-wrap
msgid "--preserve-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
msgid ""
"[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead "
"of flattening the history by replaying commits a merge commit "
@@ -44252,7 +44405,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
msgid ""
"This uses the `--interactive` machinery internally, but combining it with "
"the `--interactive` option explicitly is generally not a good idea unless "
@@ -44260,19 +44413,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
msgid ""
"Append \"exec <cmd>\" after each line creating a commit in the final "
"history. <cmd> will be interpreted as one or more shell commands. Any "
@@ -44280,31 +44433,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
msgid ""
"You may execute several commands by either using one instance of `--exec` "
"with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, no-wrap
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, no-wrap
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
msgid ""
"If `--autosquash` is used, \"exec\" lines will not be appended for the "
"intermediate commits, and will only appear at the end of each squash/fixup "
@@ -44312,14 +44465,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
msgid ""
"This uses the `--interactive` machinery internally, but it can be run "
"without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
msgid ""
"Rebase all commits reachable from <branch>, instead of limiting them with an "
"<upstream>. This allows you to rebase the root commit(s) on a branch. When "
@@ -44330,19 +44483,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, no-wrap
msgid "--autosquash"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, no-wrap
msgid "--no-autosquash"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
msgid ""
"When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), "
"and there is already a commit in the todo list that matches the same `...`, "
@@ -44356,7 +44509,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
msgid ""
"If the `--autosquash` option is enabled by default using the configuration "
"variable `rebase.autoSquash`, this option can be used to override and "
@@ -44364,7 +44517,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
msgid ""
"Automatically create a temporary stash entry before the operation begins, "
"and apply it after the operation ends. This means that you can run rebase "
@@ -44373,119 +44526,136 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, no-wrap
msgid "--reschedule-failed-exec"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, no-wrap
msgid "--no-reschedule-failed-exec"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
msgid ""
"Automatically reschedule `exec` commands that failed. This only makes sense "
"in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
msgid "--whitespace"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
msgid "--strategy"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
msgid "--strategy-option"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
msgid "--[no-]autosquash"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, no-wrap
msgid "--rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
msgid "--exec"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+msgid "--empty="
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:594
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+msgid "--preserve-merges and --empty="
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:602
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap
msgid ""
"Empty commits\n"
@@ -44493,27 +44663,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap
msgid ""
"Directory rename detection\n"
@@ -44521,35 +44693,220 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
#, no-wrap
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"Context\n"
+"~~~~~~~\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:662
+#, no-wrap
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, no-wrap
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
+#, no-wrap
+msgid ""
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:733
#, no-wrap
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
msgid ""
"You should understand the implications of using 'git rebase' on a repository "
"that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
msgid ""
"When the git-rebase command is run, it will first execute a \"pre-rebase\" "
"hook if one exists. You can use this hook to do sanity checks and reject "
@@ -44558,12 +44915,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
msgid ""
"Rebasing interactively means that you have a chance to edit the commits "
"which are rebased. You can reorder the commits, and you can remove them "
@@ -44571,72 +44928,72 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
msgid ""
"Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect "
"commit it fixes, because that commit is buried deeply in a patch series. "
@@ -44646,18 +45003,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
msgid ""
"An editor will be fired up with all the commits in your current branch "
"(ignoring merge commits), which come after the given commit. You can "
@@ -44666,7 +45023,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, no-wrap
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -44675,7 +45032,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
msgid ""
"The oneline descriptions are purely for your pleasure; 'git rebase' will not "
"look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this "
@@ -44683,7 +45040,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
msgid ""
"By replacing the command \"pick\" with the command \"edit\", you can tell "
"'git rebase' to stop after applying that commit, so that you can edit the "
@@ -44691,28 +45048,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
msgid ""
"To interrupt the rebase (just like an \"edit\" command would do, but without "
"cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
msgid ""
"If you just want to edit the commit message for a commit, replace the "
"command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
msgid ""
"To drop a commit, replace the command \"pick\" with \"drop\", or just delete "
"the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
msgid ""
"If you want to fold two or more commits into one, replace the command "
"\"pick\" for the second and subsequent commits with \"squash\" or "
@@ -44724,7 +45081,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
msgid ""
"'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when "
"a command fails due to merge errors. When you are done editing and/or "
@@ -44732,7 +45089,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
msgid ""
"For example, if you want to reorder the last 5 commits, such that what was "
"HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' "
@@ -44740,25 +45097,25 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
msgid ""
"You might want to recreate merge commits, e.g. if you have a history like "
"this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap
msgid ""
" X\n"
@@ -44769,20 +45126,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
msgid ""
"Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make "
"sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
msgid ""
"Reordering and editing commits usually creates untested intermediate steps. "
"You may want to check that your history editing did not break anything by "
@@ -44792,7 +45149,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, no-wrap
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -44805,7 +45162,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
msgid ""
"The interactive rebase will stop when a command fails (i.e. exits with non-0 "
"status) to give you an opportunity to fix the problem. You can continue with "
@@ -44813,7 +45170,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
msgid ""
"The \"exec\" command launches the command in a shell (the one specified in "
"`$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell "
@@ -44822,20 +45179,20 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
msgid ""
"This command lets you check that intermediate commits are compilable. The "
"todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap
msgid ""
"pick 5928aea one\n"
@@ -44849,13 +45206,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
msgid ""
"In interactive mode, you can mark commits with the action \"edit\". "
"However, this does not necessarily mean that 'git rebase' expects the result "
@@ -44864,7 +45221,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
msgid ""
"Start an interactive rebase with `git rebase -i <commit>^`, where <commit> "
"is the commit you want to split. In fact, any commit range will do, as long "
@@ -44872,12 +45229,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
msgid ""
"When it comes to editing that commit, execute `git reset HEAD^`. The effect "
"is that the HEAD is rewound by one, and the index follows suit. However, "
@@ -44885,7 +45242,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
msgid ""
"Now add the changes to the index that you want to have in the first commit. "
"You can use `git add` (possibly interactively) or 'git gui' (or both) to do "
@@ -44893,24 +45250,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
msgid ""
"Commit the now-current index with whatever commit message is appropriate "
"now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
msgid ""
"If you are not absolutely sure that the intermediate revisions are "
"consistent (they compile, pass the testsuite, etc.) you should use 'git "
@@ -44919,13 +45276,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
msgid ""
"Rebasing (or any other form of rewriting) a branch that others have based "
"work on is a bad idea: anyone downstream of it is forced to manually fix "
@@ -44935,7 +45292,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
msgid ""
"To illustrate, suppose you are in a situation where someone develops a "
"'subsystem' branch, and you are working on a 'topic' that is dependent on "
@@ -44943,7 +45300,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -44954,12 +45311,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -44970,14 +45327,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
msgid ""
"If you now continue development as usual, and eventually merge 'topic' to "
"'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, no-wrap
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -44988,7 +45345,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
msgid ""
"Such duplicates are generally frowned upon because they clutter up history, "
"making it harder to follow. To clean things up, you need to transplant the "
@@ -44998,31 +45355,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
msgid ""
"This happens if the 'subsystem' rebase was a simple rebase and had no "
"conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
msgid ""
"This happens if the 'subsystem' rebase had conflicts, or used "
"`--interactive` to omit, edit, squash, or fixup commits; or if the upstream "
@@ -45031,13 +45388,13 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
msgid ""
"Only works if the changes (patch IDs based on the diff contents) on "
"'subsystem' are literally the same before and after the rebase 'subsystem' "
@@ -45045,7 +45402,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
msgid ""
"In that case, the fix is easy because 'git rebase' knows to skip changes "
"that are already present in the new upstream. So if you say (assuming "
@@ -45053,18 +45410,18 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -45075,20 +45432,20 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
msgid ""
"Things get more complicated if the 'subsystem' changes do not exactly "
"correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -45098,7 +45455,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
msgid ""
"The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended "
"and your 'topic' began\", that is, what the old merge base between them "
@@ -45107,7 +45464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
msgid ""
"With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' "
"is at `subsystem@{1}`. Subsequent fetches will increase the number. (See "
@@ -45115,27 +45472,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
msgid ""
"Relative to the tip of 'topic': knowing that your 'topic' has three commits, "
"the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
msgid ""
"You can then transplant the old `subsystem..topic` to the new tip by saying "
"(for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
msgid ""
"The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' "
"downstream from 'topic' will now have to perform a \"hard case\" recovery "
@@ -45143,13 +45500,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
msgid ""
"The interactive rebase command was originally designed to handle individual "
"patch series. As such, it makes sense to exclude merge commits from the todo "
@@ -45159,7 +45516,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
msgid ""
"However, there are legitimate reasons why a developer may want to recreate "
"merge commits: to keep the branch structure (or \"commit topology\") when "
@@ -45167,7 +45524,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
msgid ""
"In the following example, the developer works on a topic branch that "
"refactors the way buttons are defined, and on another topic branch that uses "
@@ -45176,7 +45533,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -45190,7 +45547,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
msgid ""
"The developer might want to rebase those commits to a newer `master` while "
"keeping the branch topology, for example when the first topic branch is "
@@ -45200,20 +45557,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
msgid ""
"This rebase can be performed using the `--rebase-merges` option. It will "
"generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap
msgid ""
"# Branch: refactor-button\n"
@@ -45224,7 +45581,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap
msgid ""
"# Branch: report-a-bug\n"
@@ -45234,7 +45591,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap
msgid ""
"reset onto\n"
@@ -45243,14 +45600,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
msgid ""
"In contrast to a regular interactive rebase, there are `label`, `reset` and "
"`merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
msgid ""
"The `label` command associates a label with the current HEAD when that "
"command is executed. These labels are created as worktree-local refs "
@@ -45261,7 +45618,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
msgid ""
"The `reset` command resets the HEAD, index and worktree to the specified "
"revision. It is similar to an `exec git reset --hard <label>`, but refuses "
@@ -45272,7 +45629,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
msgid ""
"The `merge` command will merge the specified revision(s) into whatever is "
"HEAD at that time. With `-C <original-commit>`, the commit message of the "
@@ -45282,14 +45639,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
msgid ""
"If a `merge` command fails for any reason other than merge conflicts (i.e. "
"when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
msgid ""
"At this time, the `merge` command will *always* use the `recursive` merge "
"strategy for regular merges, and `octopus` for octopus merges, with no way "
@@ -45300,7 +45657,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
msgid ""
"Note: the first command (`label onto`) labels the revision onto which the "
"commits are rebased; The name `onto` is just a convention, as a nod to the "
@@ -45308,7 +45665,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
msgid ""
"It is also possible to introduce completely new merge commits from scratch "
"by adding a command of the form `merge <merge-head>`. This form will "
@@ -45319,7 +45676,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -45330,7 +45687,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
msgid ""
"The one commit in this list that is not related to CMake may very well have "
"been motivated by working on fixing all those bugs introduced by switching "
@@ -45339,7 +45696,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -45347,7 +45704,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap
msgid ""
"reset onto\n"
@@ -45359,7 +45716,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap
msgid ""
"reset onto\n"
@@ -45368,7 +45725,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
msgid ""
"The todo list presented by the deprecated `--preserve-merges --interactive` "
"does not represent the topology of the revision graph (use `--rebase-merges` "
@@ -45378,29 +45735,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap
msgid ""
"\t3\n"
@@ -48395,7 +48752,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap
msgid "Interrupted workflow"
msgstr ""
@@ -50347,111 +50704,100 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, no-wrap
msgid ""
-"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] "
-"[--] <file>...\n"
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
msgid ""
-"Remove files from the index, or from the working tree and the index. `git "
-"rm` will not remove a file from just your working directory. (There is no "
-"option to remove a file only from the working tree and yet keep it in the "
-"index; use `/bin/rm` if you want to do that.) The files being removed have "
-"to be identical to the tip of the branch, and no updates to their contents "
-"can be staged in the index, though that default behavior can be overridden "
-"with the `-f` option. When `--cached` is given, the staged content has to "
-"match either the tip of the branch or the file on disk, allowing the file to "
-"be removed from just the index."
+"Remove files matching pathspec from the index, or from the working tree and "
+"the index. `git rm` will not remove a file from just your working "
+"directory. (There is no option to remove a file only from the working tree "
+"and yet keep it in the index; use `/bin/rm` if you want to do that.) The "
+"files being removed have to be identical to the tip of the branch, and no "
+"updates to their contents can be staged in the index, though that default "
+"behavior can be overridden with the `-f` option. When `--cached` is given, "
+"the staged content has to match either the tip of the branch or the file on "
+"disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, no-wrap
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+msgid ""
+"Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` "
+"and `dir/file2`) can be given to remove all files in the directory, and "
+"recursively all sub-directories, but this requires the `-r` option to be "
+"explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
+msgid "The command removes only the paths that are known to Git."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:43
msgid ""
-"Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching "
-"files. If you want Git to expand file glob characters, you may need to "
-"shell-escape them. A leading directory name (e.g. `dir` to remove "
-"`dir/file1` and `dir/file2`) can be given to remove all files in the "
-"directory, and recursively all sub-directories, but this requires the `-r` "
-"option to be explicitly given."
+"File globbing matches across directory boundaries. Thus, given two "
+"directories `d` and `d2`, there is a difference between using `git rm 'd*'` "
+"and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:49
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
msgid ""
"Don't actually remove any file(s). Instead, just show if they exist in the "
"index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
msgid ""
"Use this option to unstage and remove paths only from the index. Working "
"tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, no-wrap
msgid "--ignore-unmatch"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
msgid ""
"`git rm` normally outputs one line (in the form of an `rm` command) for "
"each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-msgid ""
-"The <file> list given to the command can be exact pathnames, file glob "
-"patterns, or leading directory names. The command removes only the paths "
-"that are known to Git. Giving the name of a file that you have not told Git "
-"about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-msgid ""
-"File globbing matches across directory boundaries. Thus, given two "
-"directories `d` and `d2`, there is a difference between using `git rm 'd*'` "
-"and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
msgid ""
"There is no option for `git rm` to remove from the index only the paths that "
"have disappeared from the filesystem. However, depending on the use case, "
@@ -50459,13 +50805,13 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
msgid ""
"If you intend that your next commit should record all modifications of "
"tracked files in the working tree and record all removals of files that have "
@@ -50475,13 +50821,13 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
msgid ""
"When accepting a new code drop for a vendor branch, you probably want to "
"record both the removal of paths and additions of new paths as well as "
@@ -50489,51 +50835,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
msgid ""
"Typically you would first remove all tracked files from the working tree "
"using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
msgid ""
"and then untar the new code in the working tree. Alternately you could "
"'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
msgid ""
"After that, the easiest way to record all removals, additions, and "
"modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
msgid ""
"If all you really want to do is to remove from the index the files that are "
"no longer present in the working tree (perhaps because your working tree is "
@@ -50541,13 +50887,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
msgid ""
"Only submodules using a gitfile (which means they were cloned with a Git "
"version 1.7.8 or newer) will be removed from the work tree, as their "
@@ -50560,7 +50906,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
msgid ""
"A submodule is considered up to date when the HEAD is the same as recorded "
"in the index, no tracked files are modified and no untracked files that "
@@ -50569,7 +50915,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
msgid ""
"If you only want to remove the local checkout of a submodule from your work "
"tree without committing the removal, use linkgit:git-submodule[1] `deinit` "
@@ -50577,20 +50923,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
msgid ""
"Removes all `*.txt` files from the index that are under the `Documentation` "
"directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
msgid ""
"Note that the asterisk `*` is quoted from the shell in this example; this "
"lets Git, and not the shell, expand the pathnames of files and "
@@ -50598,20 +50944,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
msgid ""
"Because this example lets the shell expand the asterisk (i.e. you are "
"listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
msgid ""
"Each time a superproject update removes a populated submodule (e.g. when "
"switching between commits before and after the removal) a stale submodule "
@@ -53428,7 +53774,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, no-wrap
msgid ""
"'git stash' list [<options>]\n"
@@ -53438,6 +53784,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -53445,7 +53792,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
msgid ""
"Use `git stash` when you want to record the current state of the working "
"directory and the index, but want to go back to a clean working directory. "
@@ -53454,7 +53801,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
msgid ""
"The modifications stashed away by this command can be listed with `git stash "
"list`, inspected with `git stash show`, and restored (potentially on top of "
@@ -53465,7 +53812,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
msgid ""
"The latest stash you created is stored in `refs/stash`; older stashes are "
"found in the reflog of this reference and can be named using the usual "
@@ -53476,15 +53823,16 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, no-wrap
msgid ""
"push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] "
-"[-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+"[-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> "
+"[--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
msgid ""
"Save your local modifications to a new 'stash entry' and roll them back to "
"HEAD (in the working tree and in the index). The <message> part is optional "
@@ -53492,62 +53840,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
+#: en/git-stash.txt:62
msgid ""
"For quickly making a snapshot, you can omit \"push\". In this mode, "
"non-option arguments are not allowed to prevent a misspelled subcommand from "
"making an unwanted stash entry. The two exceptions to this are `stash -p` "
-"which acts as alias for `stash push -p` and pathspecs, which are allowed "
-"after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-msgid ""
-"When pathspec is given to 'git stash push', the new stash entry records the "
-"modified states only for the files that match the pathspec. The index "
-"entries and working tree files are then rolled back to the state in HEAD "
-"only for these files, too, leaving files that do not match the pathspec "
-"intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-msgid ""
-"If the `--keep-index` option is used, all changes already added to the index "
-"are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-msgid ""
-"If the `--include-untracked` option is used, all untracked files are also "
-"stashed and then cleaned up with `git clean`, leaving the working directory "
-"in a very clean state. If the `--all` option is used instead then the "
-"ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
-msgid ""
-"With `--patch`, you can interactively select hunks from the diff between "
-"HEAD and the working tree to be stashed. The stash entry is constructed "
-"such that its index state is the same as the index state of your repository, "
-"and its worktree contains only the changes you selected interactively. The "
-"selected changes are then rolled back from your worktree. See the "
-"``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
-"the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-msgid ""
-"The `--patch` option implies `--keep-index`. You can use `--no-keep-index` "
-"to override this."
+"which acts as alias for `stash push -p` and pathspec elements, which are "
+"allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap
msgid ""
"save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] "
@@ -53555,21 +53858,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
msgid ""
"This option is deprecated in favour of 'git stash push'. It differs from "
-"\"stash push\" in that it cannot take pathspecs. Instead, all non-option "
+"\"stash push\" in that it cannot take pathspec. Instead, all non-option "
"arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
msgid ""
"List the stash entries that you currently have. Each 'stash entry' is "
"listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is "
@@ -53579,7 +53882,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, no-wrap
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -53587,38 +53890,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
msgid ""
"The command takes options applicable to the 'git log' command to control "
"what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
msgid ""
"Show the changes recorded in the stash entry as a diff between the stashed "
-"contents and the commit back when the stash entry was first created. When no "
-"`<stash>` is given, it shows the latest one. By default, the command shows "
-"the diffstat, but it will accept any format known to 'git diff' (e.g., `git "
-"stash show -p stash@{1}` to view the second most recent entry in patch "
-"form). You can use stash.showStat and/or stash.showPatch config variables "
-"to change the default behavior."
+"contents and the commit back when the stash entry was first created. By "
+"default, the command shows the diffstat, but it will accept any format known "
+"to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most "
+"recent entry in patch form). You can use stash.showStat and/or "
+"stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
msgid ""
"Remove a single stashed state from the stash list and apply it on top of the "
"current working tree state, i.e., do the inverse operation of `git stash "
@@ -53626,37 +53928,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
msgid ""
"Applying the state can fail with conflicts; in this case, it is not removed "
"from the stash list. You need to resolve the conflicts by hand and call `git "
"stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-msgid ""
-"If the `--index` option is used, then tries to reinstate not only the "
-"working tree's changes, but also the index's ones. However, this can fail, "
-"when you have conflicts (which are stored in the index, where you therefore "
-"can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-msgid ""
-"When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must "
-"be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
msgid ""
"Like `pop`, but do not remove the state from the stash list. Unlike `pop`, "
"`<stash>` may be any commit that looks like a commit created by `stash push` "
@@ -53664,23 +53950,23 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
msgid ""
"Creates and checks out a new branch named `<branchname>` starting from the "
"commit at which the `<stash>` was originally created, applies the changes "
"recorded in `<stash>` to the new working tree and index. If that succeeds, "
"and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops "
-"the `<stash>`. When no `<stash>` is given, applies the latest one."
+"the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
msgid ""
"This is useful if the branch on which you ran `git stash push` has changed "
"enough that `git stash apply` fails due to conflicts. Since the stash entry "
@@ -53689,13 +53975,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
msgid ""
"Remove all the stash entries. Note that those entries will then be subject "
"to pruning, and may be impossible to recover (see 'Examples' below for a "
@@ -53703,28 +53989,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
-msgid ""
-"Remove a single stash entry from the list of stash entries. When no "
-"`<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise "
-"`<stash>` must be a valid stash log reference of the form "
-"`stash@{<revision>}`."
+#: en/git-stash.txt:136
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, no-wrap
msgid "create"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
msgid ""
"Create a stash entry (which is a regular commit object) and return its "
"object name, without storing it anywhere in the ref namespace. This is "
@@ -53733,13 +54015,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
msgid ""
"Store a given stash created via 'git stash create' (which is a dangling "
"merge commit) in the stash ref, updating the stash reflog. This is intended "
@@ -53748,7 +54030,125 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+msgid ""
+"All ignored and untracked files are also stashed and then cleaned up with "
+"`git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, no-wrap
+msgid "--include-untracked"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:167
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+msgid ""
+"Tries to reinstate not only the working tree's changes, but also the index's "
+"ones. However, this can fail, when you have conflicts (which are stored in "
+"the index, where you therefore can no longer apply the changes as they were "
+"originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, no-wrap
+msgid "--keep-index"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, no-wrap
+msgid "--no-keep-index"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:182
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+msgid ""
+"Interactively select hunks from the diff between HEAD and the working tree "
+"to be stashed. The stash entry is constructed such that its index state is "
+"the same as the index state of your repository, and its worktree contains "
+"only the changes you selected interactively. The selected changes are then "
+"rolled back from your worktree. See the ``Interactive Mode'' section of "
+"linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+msgid ""
+"The `--patch` option implies `--keep-index`. You can use `--no-keep-index` "
+"to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+msgid ""
+"This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, "
+"`store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+msgid ""
+"The new stash entry records the modified states only for the files that "
+"match the pathspec. The index entries and working tree files are then "
+"rolled back to the state in HEAD only for these files, too, leaving files "
+"that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+msgid ""
+"This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` "
+"commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+msgid ""
+"A reference of the form `stash@{<revision>}`. When no `<stash>` is given, "
+"the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
msgid ""
"A stash entry is represented as a commit whose tree records the state of the "
"working directory, and its first parent is the commit at `HEAD` when the "
@@ -53758,7 +54158,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap
msgid ""
" .----W\n"
@@ -53767,20 +54167,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
msgid ""
"where `H` is the `HEAD` commit, `I` is a commit that records the state of "
"the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
msgid ""
"When you are in the middle of something, you learn that there are upstream "
"changes that are possibly relevant to what you are doing. When your local "
@@ -53789,7 +54189,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
msgid ""
"However, there are cases in which your local changes do conflict with the "
"upstream changes, and `git pull` refuses to overwrite your changes. In such "
@@ -53798,7 +54198,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, no-wrap
msgid ""
"$ git pull\n"
@@ -53810,7 +54210,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
msgid ""
"When you are in the middle of something, your boss comes in and demands that "
"you fix something immediately. Traditionally, you would make a commit to a "
@@ -53819,7 +54219,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, no-wrap
msgid ""
"# ... hack hack hack ...\n"
@@ -53834,12 +54234,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, no-wrap
msgid ""
"# ... hack hack hack ...\n"
@@ -53851,13 +54251,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
msgid ""
"You can use `git stash push --keep-index` when you want to make two or more "
"commits out of the changes in the work tree, and you want to test each "
@@ -53865,7 +54265,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, no-wrap
msgid ""
"# ... hack hack hack ...\n"
@@ -53880,13 +54280,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
msgid ""
"If you mistakenly drop or clear stash entries, they cannot be recovered "
"through the normal safety mechanisms. However, you can try the following "
@@ -53895,7 +54295,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap
msgid ""
"git fsck --unreachable |\n"
@@ -53904,7 +54304,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
msgid ""
"linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], "
"linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -55030,7 +55430,8 @@ msgstr ""
msgid ""
"update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] "
"[-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] "
-"[--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+"[--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] "
+"[<path>...]"
msgstr ""
#. type: Plain text
@@ -55248,7 +55649,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -55610,7 +56011,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+msgid ""
+"This option is only valid for the update command. Clone only one branch "
+"during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
msgid ""
"Paths to submodule(s). When specified this will restrict the command to only "
"operate on the submodules found at the specified paths. (This argument is "
@@ -55618,7 +56026,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
msgid ""
"When initializing submodules, a `.gitmodules` file in the top-level "
"directory of the containing repository is used to find the url of each "
@@ -55628,7 +56036,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr ""
@@ -58711,7 +59119,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap
msgid "<commit>"
msgstr ""
@@ -59228,19 +59636,39 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
msgid ""
-"Set the path to the repository. This can also be controlled by setting the "
-"`GIT_DIR` environment variable. It can be an absolute path or relative path "
-"to current working directory."
+"Set the path to the repository (\".git\" directory). This can also be "
+"controlled by setting the `GIT_DIR` environment variable. It can be an "
+"absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+msgid ""
+"Specifying the location of the \".git\" directory using this option (or "
+"`GIT_DIR` environment variable) turns off the repository discovery that "
+"tries to find a directory with \".git\" subdirectory (which is how the "
+"repository and the top-level of the working tree are discovered), and tells "
+"Git that you are at the top level of the working tree. If you are not at "
+"the top-level directory of the working tree, you should tell Git where the "
+"top-level of the working tree is, with the `--work-tree=<path>` option (or "
+"`GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+msgid ""
+"If you just want to run git as if it was started in `<path>` then use `git "
+"-C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
msgid ""
"Set the path to the working tree. It can be an absolute path or a path "
"relative to the current working directory. This can also be controlled by "
@@ -59250,26 +59678,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
msgid ""
"Set the Git namespace. See linkgit:gitnamespaces[7] for more details. "
"Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
msgid ""
"Currently for internal use only. Set a prefix which gives a path from above "
"a repository down to its root. One use is to give submodules context about "
@@ -59277,33 +59705,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
msgid ""
"Treat the repository as a bare repository. If GIT_DIR environment is not "
"set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, no-wrap
msgid "--no-replace-objects"
msgstr ""
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
msgid ""
"Do not use replacement refs to replace Git objects. See "
"linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, no-wrap
msgid "--literal-pathspecs"
msgstr ""
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
msgid ""
"Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is "
"equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to "
@@ -59311,13 +59739,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, no-wrap
msgid "--glob-pathspecs"
msgstr ""
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
msgid ""
"Add \"glob\" magic to all pathspec. This is equivalent to setting the "
"`GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on "
@@ -59325,13 +59753,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, no-wrap
msgid "--noglob-pathspecs"
msgstr ""
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
msgid ""
"Add \"literal\" magic to all pathspec. This is equivalent to setting the "
"`GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on "
@@ -59339,39 +59767,39 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, no-wrap
msgid "--icase-pathspecs"
msgstr ""
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
msgid ""
"Add \"icase\" magic to all pathspec. This is equivalent to setting the "
"`GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, no-wrap
msgid "--no-optional-locks"
msgstr ""
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
msgid ""
"Do not perform optional operations that require locks. This is equivalent to "
"setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, no-wrap
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
msgid ""
"List commands by group. This is an internal/experimental option and may "
"change or be removed in the future. Supported groups are: builtins, parseopt "
@@ -59383,88 +59811,88 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
msgid ""
"We divide Git into high level (\"porcelain\") commands and low level "
"(\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
msgid ""
"We separate the porcelain commands into the main commands and some ancillary "
"user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
msgid ""
"These commands are to interact with foreign SCM and with other people via "
"patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
msgid ""
"There are three commands with similar names: `git reset`, `git restore` and "
"`git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
msgid ""
"linkgit:git-revert[1] is about making a new commit that reverts the changes "
"made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
msgid ""
"linkgit:git-restore[1] is about restoring files in the working tree from "
"either the index or another commit. This command does not update your "
@@ -59473,7 +59901,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
msgid ""
"linkgit:git-reset[1] is about updating your branch, moving the tip in order "
"to add or remove commits from the branch. This operation changes the commit "
@@ -59481,20 +59909,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
msgid ""
"`git reset` can also be used to restore the index, overlapping with `git "
"restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
msgid ""
"Although Git includes its own porcelain layer, its low-level commands are "
"sufficient to support development of alternative porcelains. Developers of "
@@ -59503,7 +59931,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
msgid ""
"The interface (input, output, set of options and the semantics) to these "
"low-level commands are meant to be a lot more stable than Porcelain level "
@@ -59513,7 +59941,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
msgid ""
"The following description divides the low-level commands into commands that "
"manipulate objects (in the repository, index, and working tree), commands "
@@ -59522,65 +59950,65 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
msgid ""
"In general, the interrogate commands do not touch the files in the working "
"tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
msgid ""
"The following are helper commands used by the above; end users typically do "
"not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
msgid ""
"These are internal helper commands used by other commands; end users "
"typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
msgid ""
"Git uses a simple text format to store customizations that are per "
"repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap
msgid ""
"#\n"
@@ -59589,7 +60017,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap
msgid ""
"; user identity\n"
@@ -59599,7 +60027,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
msgid ""
"Various commands read from the configuration file and adjust their operation "
"accordingly. See linkgit:git-config[1] for a list and more details about "
@@ -59607,39 +60035,39 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
msgid ""
"Indicates a tree, commit or tag object name. A command that takes a "
"<tree-ish> argument ultimately wants to operate on a <tree> object but "
@@ -59648,13 +60076,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
msgid ""
"Indicates a commit or tag object name. A command that takes a <commit-ish> "
"argument ultimately wants to operate on a <commit> object but automatically "
@@ -59662,107 +60090,107 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
msgid ""
"Indicates that an object type is required. Currently one of: `blob`, "
"`tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
msgid ""
"Indicates a filename - almost always relative to the root of the tree "
"structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
msgid ""
"Any Git command accepting any <object> can also use the following symbolic "
"notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
msgid ""
"For a more complete list of ways to spell object names, see \"SPECIFYING "
"REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
msgid ""
"Higher level SCMs may provide and manage additional information in the "
"`$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
msgid ""
"These environment variables apply to 'all' core Git commands. Nb: it is "
"worth noting that they may be used/overridden by SCMS sitting above Git so "
@@ -59770,26 +60198,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, no-wrap
msgid "`GIT_INDEX_FILE`"
msgstr ""
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
msgid ""
"This environment allows the specification of an alternate index file. If not "
"specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, no-wrap
msgid "`GIT_INDEX_VERSION`"
msgstr ""
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
msgid ""
"This environment variable allows the specification of an index version for "
"new repositories. It won't affect existing index files. By default index "
@@ -59798,13 +60226,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, no-wrap
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr ""
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
msgid ""
"If the object storage directory is specified via this environment variable "
"then the sha1 directories are created underneath - otherwise the default "
@@ -59812,13 +60240,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, no-wrap
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr ""
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
msgid ""
"Due to the immutable nature of Git objects, old objects can be archived into "
"shared, read-only directories. This variable specifies a \":\" separated (on "
@@ -59828,7 +60256,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
msgid ""
"Entries that begin with `\"` (double-quote) will be interpreted as C-style "
"quoted paths, removing leading and trailing double-quotes and respecting "
@@ -59838,13 +60266,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, no-wrap
msgid "`GIT_DIR`"
msgstr ""
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
msgid ""
"If the `GIT_DIR` environment variable is set then it specifies a path to use "
"instead of the default `.git` for the base of the repository. The "
@@ -59852,13 +60280,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, no-wrap
msgid "`GIT_WORK_TREE`"
msgstr ""
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
msgid ""
"Set the path to the root of the working tree. This can also be controlled "
"by the `--work-tree` command-line option and the core.worktree configuration "
@@ -59866,26 +60294,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, no-wrap
msgid "`GIT_NAMESPACE`"
msgstr ""
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
msgid ""
"Set the Git namespace; see linkgit:gitnamespaces[7] for details. The "
"`--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, no-wrap
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr ""
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
msgid ""
"This should be a colon-separated list of absolute paths. If set, it is a "
"list of directories that Git should not chdir up into while looking for a "
@@ -59900,13 +60328,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, no-wrap
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr ""
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
msgid ""
"When run in a directory that does not have \".git\" repository directory, "
"Git tries to find such a directory in the parent directories to find the top "
@@ -59918,13 +60346,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, no-wrap
msgid "`GIT_COMMON_DIR`"
msgstr ""
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
msgid ""
"If this variable is set to a path, non-worktree files that are normally in "
"$GIT_DIR will be taken from this path instead. Worktree-specific files such "
@@ -59935,72 +60363,121 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, no-wrap
msgid "`GIT_AUTHOR_NAME`"
msgstr ""
+#. type: Plain text
+#: en/git.txt:502
+msgid ""
+"The human-readable name used in the author identity when creating commit or "
+"tag objects, or when writing reflogs. Overrides the `user.name` and "
+"`author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, no-wrap
msgid "`GIT_AUTHOR_EMAIL`"
msgstr ""
+#. type: Plain text
+#: en/git.txt:507
+msgid ""
+"The email address used in the author identity when creating commit or tag "
+"objects, or when writing reflogs. Overrides the `user.email` and "
+"`author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, no-wrap
msgid "`GIT_AUTHOR_DATE`"
msgstr ""
+#. type: Plain text
+#: en/git.txt:511
+msgid ""
+"The date used for the author identity when creating commit or tag objects, "
+"or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, no-wrap
msgid "`GIT_COMMITTER_NAME`"
msgstr ""
+#. type: Plain text
+#: en/git.txt:516
+msgid ""
+"The human-readable name used in the committer identity when creating commit "
+"or tag objects, or when writing reflogs. Overrides the `user.name` and "
+"`committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, no-wrap
msgid "`GIT_COMMITTER_EMAIL`"
msgstr ""
+#. type: Plain text
+#: en/git.txt:521
+msgid ""
+"The email address used in the author identity when creating commit or tag "
+"objects, or when writing reflogs. Overrides the `user.email` and "
+"`committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, no-wrap
msgid "`GIT_COMMITTER_DATE`"
msgstr ""
+#. type: Plain text
+#: en/git.txt:525
+msgid ""
+"The date used for the committer identity when creating commit or tag "
+"objects, or when writing reflogs. See linkgit:git-commit[1] for valid "
+"formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:490
+#: en/git.txt:526
#, no-wrap
-msgid "'EMAIL'"
+msgid "`EMAIL`"
msgstr ""
#. type: Plain text
-#: en/git.txt:492
-msgid "see linkgit:git-commit-tree[1]"
+#: en/git.txt:529
+msgid ""
+"The email address used in the author and committer identities if no other "
+"relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, no-wrap
msgid "`GIT_DIFF_OPTS`"
msgstr ""
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
msgid ""
"Only valid setting is \"--unified=??\" or \"-u??\" to set the number of "
"context lines shown when a unified diff is created. This takes precedence "
@@ -60009,13 +60486,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, no-wrap
msgid "`GIT_EXTERNAL_DIFF`"
msgstr ""
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
msgid ""
"When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named "
"by it is called, instead of the diff invocation described above. For a path "
@@ -60024,56 +60501,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
msgid ""
"The file parameters can point at the user's working file (e.g. `new-file` in "
"\"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), "
@@ -60083,62 +60560,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
msgid ""
"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, "
"<path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
msgid ""
"For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, "
"`GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, no-wrap
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr ""
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, no-wrap
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr ""
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, no-wrap
msgid "`GIT_MERGE_VERBOSITY`"
msgstr ""
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
msgid ""
"A number controlling the amount of output shown by the recursive merge "
"strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, no-wrap
msgid "`GIT_PAGER`"
msgstr ""
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
msgid ""
"This environment variable overrides `$PAGER`. If it is set to an empty "
"string or to the value \"cat\", Git will not launch a pager. See also the "
@@ -60146,26 +60623,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, no-wrap
msgid "`GIT_PROGRESS_DELAY`"
msgstr ""
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
msgid ""
"A number controlling how many seconds to delay before showing optional "
"progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, no-wrap
msgid "`GIT_EDITOR`"
msgstr ""
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
msgid ""
"This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by "
"several Git commands when, on interactive mode, an editor is to be "
@@ -60174,19 +60651,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, no-wrap
msgid "`GIT_SSH`"
msgstr ""
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, no-wrap
msgid "`GIT_SSH_COMMAND`"
msgstr ""
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
msgid ""
"If either of these environment variables is set then 'git fetch' and 'git "
"push' will use the specified command instead of 'ssh' when they need to "
@@ -60196,7 +60673,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
msgid ""
"`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by "
"the shell, which allows additional arguments to be included. `$GIT_SSH` on "
@@ -60205,7 +60682,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
msgid ""
"Usually it is easier to configure any desired options through your personal "
"`.ssh/config` file. Please consult your ssh documentation for further "
@@ -60213,13 +60690,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, no-wrap
msgid "`GIT_SSH_VARIANT`"
msgstr ""
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
msgid ""
"If this environment variable is set, it overrides Git's autodetection "
"whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, "
@@ -60228,13 +60705,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, no-wrap
msgid "`GIT_ASKPASS`"
msgstr ""
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
msgid ""
"If this environment variable is set, then Git commands which need to acquire "
"passwords or passphrases (e.g. for HTTP or IMAP authentication) will call "
@@ -60244,26 +60721,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, no-wrap
msgid "`GIT_TERMINAL_PROMPT`"
msgstr ""
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
msgid ""
"If this environment variable is set to `0`, git will not prompt on the "
"terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, no-wrap
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr ""
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
msgid ""
"Whether to skip reading settings from the system-wide "
"`$(prefix)/etc/gitconfig` file. This environment variable can be used along "
@@ -60274,13 +60751,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, no-wrap
msgid "`GIT_FLUSH`"
msgstr ""
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -60295,27 +60772,27 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, no-wrap
msgid "`GIT_TRACE`"
msgstr ""
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
msgid ""
"Enables general trace messages, e.g. alias expansion, built-in command "
"execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
msgid ""
"If this variable is set to \"1\", \"2\" or \"true\" (comparison is case "
"insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
msgid ""
"If the variable is set to an integer value greater than 2 and lower than 10 "
"(strictly) then Git will interpret this value as an open file descriptor and "
@@ -60323,7 +60800,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
msgid ""
"Alternatively, if the variable is set to an absolute path (starting with a "
"'/' character), Git will interpret this as a file path and will try to "
@@ -60331,33 +60808,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
msgid ""
"Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case "
"insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, no-wrap
msgid "`GIT_TRACE_FSMONITOR`"
msgstr ""
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
msgid ""
"Enables trace messages for the filesystem monitor extension. See "
"`GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, no-wrap
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr ""
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
msgid ""
"Enables trace messages for all accesses to any packs. For each access, the "
"pack file name and an offset in the pack is recorded. This may be helpful "
@@ -60366,13 +60843,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, no-wrap
msgid "`GIT_TRACE_PACKET`"
msgstr ""
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
msgid ""
"Enables trace messages for all packets coming in or out of a given "
"program. This can help with debugging object negotiation or other protocol "
@@ -60382,13 +60859,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, no-wrap
msgid "`GIT_TRACE_PACKFILE`"
msgstr ""
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
msgid ""
"Enables tracing of packfiles sent or received by a given program. Unlike "
"other trace output, this trace is verbatim: no headers, and no quoting of "
@@ -60398,33 +60875,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
msgid ""
"Note that this is currently only implemented for the client side of clones "
"and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, no-wrap
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr ""
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
msgid ""
"Enables performance related trace messages, e.g. total execution time of "
"each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, no-wrap
msgid "`GIT_TRACE_SETUP`"
msgstr ""
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
msgid ""
"Enables trace messages printing the .git, working tree and current working "
"directory after Git has completed its setup phase. See `GIT_TRACE` for "
@@ -60432,26 +60909,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, no-wrap
msgid "`GIT_TRACE_SHALLOW`"
msgstr ""
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
msgid ""
"Enables trace messages that can help debugging fetching / cloning of shallow "
"repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, no-wrap
msgid "`GIT_TRACE_CURL`"
msgstr ""
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
msgid ""
"Enables a curl full trace dump of all incoming and outgoing data, including "
"descriptive information, of the git transport protocol. This is similar to "
@@ -60461,33 +60938,33 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, no-wrap
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr ""
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
msgid ""
"When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data "
"(that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, no-wrap
msgid "`GIT_TRACE2`"
msgstr ""
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
msgid ""
"Enables more detailed trace messages from the \"trace2\" library. Output "
"from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
msgid ""
"Alternatively, if the variable is set to an absolute path (starting with a "
"'/' character), Git will interpret this as a file path and will try to "
@@ -60498,7 +60975,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
msgid ""
"In addition, if the variable is set to "
"`af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path "
@@ -60506,18 +60983,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, no-wrap
msgid "`GIT_TRACE2_EVENT`"
msgstr ""
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
msgid ""
"This setting writes a JSON-based format that is suited for machine "
"interpretation. See `GIT_TRACE2` for available trace output options and "
@@ -60525,13 +61002,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, no-wrap
msgid "`GIT_TRACE2_PERF`"
msgstr ""
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
msgid ""
"In addition to the text-based messages available in `GIT_TRACE2`, this "
"setting writes a column-based format for understanding nesting regions. See "
@@ -60540,13 +61017,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, no-wrap
msgid "`GIT_REDACT_COOKIES`"
msgstr ""
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
msgid ""
"This can be set to a comma-separated list of strings. When a curl trace is "
"enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by "
@@ -60555,13 +61032,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, no-wrap
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr ""
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
msgid ""
"Setting this variable to `1` will cause Git to treat all pathspecs "
"literally, rather than as glob patterns. For example, running "
@@ -60572,52 +61049,52 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, no-wrap
msgid "`GIT_GLOB_PATHSPECS`"
msgstr ""
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
msgid ""
"Setting this variable to `1` will cause Git to treat all pathspecs as glob "
"patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, no-wrap
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr ""
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
msgid ""
"Setting this variable to `1` will cause Git to treat all pathspecs as "
"literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, no-wrap
msgid "`GIT_ICASE_PATHSPECS`"
msgstr ""
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
msgid ""
"Setting this variable to `1` will cause Git to treat all pathspecs as "
"case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, no-wrap
msgid "`GIT_REFLOG_ACTION`"
msgstr ""
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
msgid ""
"When a ref is updated, reflog entries are created to keep track of the "
"reason why the ref was updated (which is typically the name of the "
@@ -60629,13 +61106,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, no-wrap
msgid "`GIT_REF_PARANOIA`"
msgstr ""
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
msgid ""
"If set to `1`, include broken or badly named refs when iterating over lists "
"of refs. In a normal, non-corrupted repository, this does nothing. However, "
@@ -60648,13 +61125,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, no-wrap
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr ""
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
msgid ""
"If set to a colon-separated list of protocols, behave as if `protocol.allow` "
"is set to `never`, and each of the listed protocols has "
@@ -60665,13 +61142,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, no-wrap
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr ""
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
msgid ""
"Set to 0 to prevent protocols used by fetch/push/clone which are configured "
"to the `user` state. This is useful to restrict recursive submodule "
@@ -60681,13 +61158,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, no-wrap
msgid "`GIT_PROTOCOL`"
msgstr ""
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
msgid ""
"For internal use only. Used in handshaking the wire protocol. Contains a "
"colon ':' separated list of keys with optional values 'key[=value]'. "
@@ -60695,13 +61172,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, no-wrap
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr ""
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
msgid ""
"If set to `0`, Git will complete any requested operation without performing "
"any optional sub-operations that require taking a lock. For example, this "
@@ -60711,25 +61188,25 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, no-wrap
msgid "`GIT_REDIRECT_STDIN`"
msgstr ""
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, no-wrap
msgid "`GIT_REDIRECT_STDOUT`"
msgstr ""
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, no-wrap
msgid "`GIT_REDIRECT_STDERR`"
msgstr ""
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
msgid ""
"Windows-only: allow redirecting the standard input/output/error handles to "
"paths specified by the environment variables. This is particularly useful in "
@@ -60742,7 +61219,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
msgid ""
"Two special values are supported: `off` will simply close the corresponding "
"standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will "
@@ -60750,13 +61227,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
msgid ""
"If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. "
"This affects indications of detached HEADs (linkgit:git-checkout[1]) and the "
@@ -60766,13 +61243,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
msgid ""
"More detail on the following is available from the "
"link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] "
@@ -60780,7 +61257,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
msgid ""
"A Git project normally consists of a working directory with a \".git\" "
"subdirectory at the top level. The .git directory contains, among other "
@@ -60791,7 +61268,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
msgid ""
"The object database contains objects of three main types: blobs, which hold "
"file data; trees, which point to blobs and other trees to build up directory "
@@ -60800,7 +61277,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
msgid ""
"The commit, equivalent to what other systems call a \"changeset\" or "
"\"version\", represents a step in the project's history, and each parent "
@@ -60809,7 +61286,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
msgid ""
"All objects are named by the SHA-1 hash of their contents, normally written "
"as a string of 40 hex digits. Such names are globally unique. The entire "
@@ -60818,14 +61295,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
msgid ""
"When first created, objects are stored in individual files, but for "
"efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
msgid ""
"Named pointers called refs mark interesting points in history. A ref may "
"contain the SHA-1 name of an object or the name of another ref. Refs with "
@@ -60836,7 +61313,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
msgid ""
"The index file is initialized with a list of all paths and, for each path, a "
"blob object and a set of attributes. The blob object represents the "
@@ -60848,7 +61325,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
msgid ""
"The index is also capable of storing multiple entries (called \"stages\") "
"for a given pathname. These stages are used to hold the various unmerged "
@@ -60856,20 +61333,20 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
msgid ""
"See the references in the \"description\" section to get started using Git. "
"The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
msgid ""
"The link:user-manual.html#git-concepts[Git concepts chapter of the "
"user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to "
@@ -60877,37 +61354,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
msgid ""
"See also the link:howto-index.html[howto] documents for some useful "
"examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
msgid ""
"The internals are documented in the link:technical/api-index.html[Git API "
"documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
msgid ""
"Git was started by Linus Torvalds, and is currently maintained by Junio C "
"Hamano. Numerous contributions have come from the Git mailing list "
@@ -60916,7 +61393,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
msgid ""
"If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] "
"and linkgit:git-blame[1] can show you the authors for specific parts of the "
@@ -60924,13 +61401,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
msgid ""
"Report bugs to the Git mailing list <git@vger.kernel.org> where the "
"development and maintenance is primarily done. You do not have to be "
@@ -60939,14 +61416,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
msgid ""
"Issues which are security relevant should be disclosed privately to the Git "
"Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
msgid ""
"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], "
@@ -62084,7 +62561,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+msgid ""
+"Users often try to use the assume-unchanged and skip-worktree bits to tell "
+"Git to ignore changes to files that are tracked. This does not work as "
+"expected, since Git may still check working tree files against the index "
+"when performing certain operations. In general, Git does not provide a way "
+"to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+msgid ""
+"For example, if the file you want to change is some sort of config file, the "
+"repository can include a sample config file that can then be copied into the "
+"ignored name and modified. The repository can even include a script to "
+"treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr ""
@@ -66994,7 +67490,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -67389,16 +67885,27 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, no-wrap
-msgid "'%gD'"
+msgid "'%GT'"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:230
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, no-wrap
+msgid "'%gD'"
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:231
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
msgid ""
"minutes ago}`; the format follows the rules described for the `-g` "
"option. The portion before the `@` is the refname as given on the command "
@@ -67407,98 +67914,98 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, no-wrap
msgid "'%gd'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
msgid ""
"portion is shortened for human readability (so `refs/heads/master` becomes "
"just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, no-wrap
msgid "'%gn'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, no-wrap
msgid "'%gN'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, no-wrap
msgid "'%ge'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, no-wrap
msgid "'%gE'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, no-wrap
msgid "'%gs'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
msgid ""
"interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may "
"be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
msgid ""
"'key=<K>': only show trailers with specified key. Matching is done "
"case-insensitively and trailing colon is optional. If option is given "
@@ -67510,7 +68017,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
msgid ""
"'only[=val]': select whether non-trailer lines from the trailer block should "
"be included. The `only` keyword may optionally be followed by an equal sign "
@@ -67520,7 +68027,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
msgid ""
"'separator=<SEP>': specify a separator inserted between trailer lines. When "
"this option is not given each trailer line is terminated with a line feed "
@@ -67532,7 +68039,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
msgid ""
"'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option "
"was given. In same way as to for `only` it can be followed by an equal sign "
@@ -67541,14 +68048,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
msgid ""
"'valueonly[=val]': skip over the key part of the trailer line and only show "
"the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
msgid ""
"Some placeholders may depend on other options given to the revision "
"traversal engine. For example, the `%g*` reflog options will insert an empty "
@@ -67558,7 +68065,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
msgid ""
"If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is "
"inserted immediately before the expansion if and only if the placeholder "
@@ -67566,7 +68073,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
msgid ""
"If you add a `-` (minus sign) after '%' of a placeholder, all consecutive "
"line-feeds immediately preceding the expansion are deleted if and only if "
@@ -67574,7 +68081,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
msgid ""
"If you add a ` ` (space) after '%' of a placeholder, a space is inserted "
"immediately before the expansion if and only if the placeholder expands to a "
@@ -67582,12 +68089,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
msgid ""
"The 'tformat:' format works exactly like 'format:', except that it provides "
"\"terminator\" semantics instead of \"separator\" semantics. In other words, "
@@ -67598,7 +68105,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -67608,7 +68115,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -67618,14 +68125,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
msgid ""
"In addition, any unrecognized string that has a `%` in it is interpreted as "
"if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 0ffaaf7..fdfe2bf 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-01-02 15:21+0000\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr "Mostrar SHA-1 em branco para confirma챌천es de commits. Isso tamb챕m pode ser controlado atrav챕s da op챌찾o de configura챌찾o 'blame.blankboundary'."
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -77,7 +77,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr "<come챌o> e <fim> s찾o opcionais. ``-L <come챌o>\" ou ``-L <come챌o>,\" toma do <come챌o> at챕 o fim do arquivo. ``-L <fim>\" toma do come챌o do arquivo at챕 <fim>."
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr "Mostra o rev longo (Padr찾o: desligado)."
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -125,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr "Caminhe para a frente em vez de para tr찼s. Em vez de mostrar a revis찾o em que uma linha apareceu, isso mostra a 첬ltima revis찾o em que uma linha existiu. Isso requer um intervalo de revis찾o como START..END, onde o path respons찼vel existe em START. --'git blame --reverse START' is taken as 'git blame --reverse START..HEAD' por conveni챗ncia."
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -277,7 +277,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -709,7 +709,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr "Opera챌찾o bidirecional entre um reposit처rio do Subversion e Git."
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1658,8 +1658,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr "Atualiza o nome do objeto guardado em uma ref de forma segura."
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2535,61 +2535,62 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr "O valor de uma vari찼vel que pega uma cor de uma lista de cores (ao menos duas, uma para o foreground e outra para o background) e atributos (quantos voc챗 quiser), separados por espa챌os."
#. type: Plain text
-#: en/config.txt:267
-#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+#: en/config.txt:269
+#, fuzzy, priority:100
+#| msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr "As cores b찼sicas aceitas s찾o `black` (preto) , `red` (vermelho) , `green` (verde), `yellow` (amarelo) , `blue` (azul), `magenta` (magenta), `cyan` (ciano) and `white` (branco) para o primeiro plano; o segundo 챕 o segundo plano."
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr "As cores tamb챕m podem ser dadas como n첬meros entre 0 e 255; estes usam o modo ANSI de 256 cores (mas note que nem todos os terminais suportam isso). Se o seu terminal suportar, voc챗 tamb챕m pode especificar valores RGB de 24 bits como hexadecimais, como `#ff0ab3`."
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr "Os atributos aceitos s찾o `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, e `strike` (para letras cruzadas ou \"rasuradas\"). A posi챌찾o de qualquer atributo em rela챌찾o 횪s cores (antes, depois ou entre) n찾o importa. Atributos espec챠ficos podem ser desativados prefixando-os com `no` ou `no-` (por exemplo, `noreverse`, `no-ul`, etc)."
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr "Uma sequ챗ncia de cores vazia n찾o produz nenhum efeito de cor. Isso pode ser usado para evitar colorir elementos espec챠ficos sem desabilitar totalmente a cor."
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr "Para os slots de cores predefinidos do git, os atributos devem ser redefinidos no in챠cio de cada item na sa챠da colorida. Portanto, definir `color.decorate.branch` como `black` ir찼 pintar esse nome de branch em `black`, mesmo que a anterior esteja na mesma linha de sa챠da (por exemplo, abrindo par챗nteses antes da linha de nomes de ramifica챌천es em `log --decorate`) 챕 definido para ser pintado com `bold` ou algum outro atributo. No entanto, formatos de log personalizados podem fazer cores mais complicadas e em camadas, e os formul찼rios negados podem ser 첬teis l찼."
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr "caminho do diret처rio"
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr "Uma vari찼vel que recebe um valor de nome de caminho pode receber uma string que come챌a com \"`~/`\" ou \"`~user/`\", e a expans찾o usual do til acontece com essa string: `~/` 챕 expandida para o valor de `$HOME`, e `~user/` para o diret처rio inicial do usu찼rio especificado."
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr "Vari찼veis"
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr "Note que esta lista n찾o 챕 abrangente e n찾o necessariamente completa. Para vari찼veis espec챠ficas de comando, voc챗 encontrar찼 uma descri챌찾o mais detalhada na p찼gina de manual apropriada."
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr "Outras ferramentas relacionadas ao git podem e usam suas pr처prias vari찼veis. Ao inventar novas vari찼veis para uso em sua pr처pria ferramenta, certifique-se de que seus nomes n찾o conflitem com aqueles que s찾o usados pelo pr처prio Git e outras ferramentas populares, e descrev챗-los em sua documenta챌찾o."
@@ -3688,7 +3689,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr "Quando mostrado pelo `git diff-tree -c`, ele compara os pais de uma consolida챌찾o de mesclagem com o resultado da mesclagem (ou seja, file1..fileN s찾o os pais). Quando mostrado pelo `git diff-files -c`, compara os dois pais de mesclagem n찾o resolvidos com o arquivo da 찼rvore de trabalho (ou seja, file1 챕 o est찼gio 2, tamb챕m conhecido como\" nossa vers찾o \", file2 챕 o est찼gio 3\" aka sua vers찾o \")."
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3700,13 +3701,13 @@ msgid "Generate plain patches without any diffstats."
msgstr "Gere corre챌천es simples sem qualquer diffstats."
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4178,7 +4179,7 @@ msgid "Synonym for `-p --stat`."
msgstr "Sin척nimo para `-p --stat`."
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4212,7 +4213,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr "Sem esta op챌찾o, nomes de caminho com caracteres \"incomuns\" s찾o citados como explicado para a vari찼vel de configura챌찾o `core.quotePath` (veja linkgit:git-config [1])."
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4248,7 +4249,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr "Especifique como as diferen챌as nos subm처dulos s찾o mostradas. Ao especificar `--submodule = short`, o formato 'short' 챕 usado. Este formato mostra apenas os nomes das confirma챌천es no in챠cio e no final do intervalo. Quando `--subm처dulo` ou` --subm처dulo = log` 챕 especificado, o formato 'log' 챕 usado. Este formato lista os commits no intervalo como linkgit:git-submodule [1] `summary` faz. Quando `--submodule = diff` 챕 especificado, o formato 'diff' 챕 usado. Este formato mostra um diff inline das altera챌천es no conte첬do do subm처dulo entre o intervalo de confirma챌찾o. O padr찾o 챕 `diff.submodule` ou o formato 'short' se a op챌찾o de configura챌찾o n찾o estiver definida."
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr "--color [= <quando>]"
@@ -4270,7 +4271,7 @@ msgstr ""
"\tdefini챌천es de configura챌찾o\n"
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4898,11 +4899,15 @@ msgstr "Para ilustrar a diferen챌a entre `-S <regex> --pickaxe-regex` e` -G <reg
#. type: delimited block -
#: en/diff-options.txt:573
-#, ignore-ellipsis, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid ""
+#| "+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+#| "...\n"
+#| "- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
"+�� return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
"...\n"
@@ -4910,8 +4915,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
-#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+#, fuzzy, priority:280
+#| msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr "Enquanto o `git log -G\" regexec\\(regexp\"` mostrar찼 este commit, `git log -S\" regexec\\(regexp\"--pickaxe-regex` n찾o ser찼 (porque o n첬mero de ocorr챗ncias dessa string n찾o foi alterado) ."
#. type: Plain text
@@ -5041,13 +5047,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr "Quando executado a partir de um subdiret처rio do projeto, ele pode ser instru챠do a excluir as mudan챌as fora do diret처rio e mostrar nomes de caminhos relativos a ele com essa op챌찾o. Quando voc챗 n찾o est찼 em um subdiret처rio (por exemplo, em um reposit처rio vazio), 챕 poss챠vel nomear o subdiret처rio para tornar a sa챠da relativa, fornecendo um <path> como um argumento."
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -5083,7 +5089,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -5125,13 +5131,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr "Mostra o contexto entre os peda챌os de diff, at챕 o n첬mero especificado de linhas, assim fundindo partes pr처ximas umas das outras. O padr찾o 챕 `diff.interHunkContext` ou 0 se a op챌찾o de configura챌찾o n찾o estiver definida."
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr "-W"
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -5143,7 +5149,7 @@ msgid "Show whole surrounding functions of changes."
msgstr "Mostrar fun챌천es vizinhas inteiras de mudan챌as."
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -5155,7 +5161,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr "Fa챌a o programa sair com c처digos semelhantes ao diff(1). Ou seja, sai com 1 se houver diferen챌as e 0 significa sem diferen챌as."
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5191,13 +5197,13 @@ msgid "Disallow external diff drivers."
msgstr "N찾o permitir drivers externos de diferen챌as."
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5287,7 +5293,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr "Para uma explica챌찾o mais detalhada sobre estas op챌천es comuns, veja tamb챕m linkgit:gitdiffcore[7]."
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5419,7 +5425,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr "Veja tamb챕m a vari찼vel de configura챌찾o `fetch.negotiationAlgorithm` documentada em linkgit:git-config[1]."
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5431,13 +5437,13 @@ msgid "Show what would be done, without making any changes."
msgstr "Mostre o que seria feito, sem fazer altera챌천es."
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5471,7 +5477,7 @@ msgid "\tThis option overrides that check.\n"
msgstr "\tEsta op챌찾o sobrescreve essa verifica챌찾o.\n"
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5543,7 +5549,7 @@ msgid "See the PRUNING section below for more details."
msgstr "Veja a se챌찾o de PRUNING abaixo para mais detalhes."
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr "-p"
@@ -5561,7 +5567,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr "Antes de buscar, remova quaisquer tags locais que n찾o existam mais no controle remoto se `--prune` estiver ativado. Esta op챌찾o deve ser usada com mais cuidado, ao contr찼rio de `--prune` ela ir찼 remover quaisquer refer챗ncias locais (tags locais) que tenham sido criadas. Esta op챌찾o 챕 uma forma abreviada de fornecer o refspec de tag expl챠cito junto com o `--prune`, veja a discuss찾o sobre isso em sua documenta챌찾o."
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5585,254 +5591,255 @@ msgid "--refmap=<refspec>"
msgstr "--refmap=<refspec>"
#. type: Plain text
-#: en/fetch-options.txt:144
-#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+#: en/fetch-options.txt:147
+#, fuzzy, priority:220
+#| msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr "Ao buscar refs listadas na linha de comando, use o refspec especificado (pode ser fornecido mais de uma vez) para mapear os refs para filiais de rastreamento remoto, em vez dos valores das vari찼veis de configura챌찾o `remote.*.Fetch` para o reposit처rio remoto. Consulte a se챌찾o \"Ramifica챌천es de rastreamento remoto configuradas\" para detalhes."
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr "Busque todas as tags do controle remoto (ou seja, busque as tags remotas `refs/tags/*` em tags locais com o mesmo nome), al챕m de qualquer outra coisa que seria buscada. Usar essa op챌찾o sozinha n찾o submete as tags 횪 remo챌찾o, mesmo se --prune for usado (embora as tags possam ser removidas de qualquer maneira, se elas tamb챕m forem o destino de uma refer챗ncia expl챠cita; consulte `--prune`)."
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr "--recurso-subm처dulos[=sim|sob-demanda|n찾o]"
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr "Essa op챌찾o controla se e sob quais condi챌천es novas confirma챌천es de subm처dulos preenchidos devem ser buscadas tamb챕m. Ele pode ser usado como uma op챌찾o booleana para desabilitar completamente a recurs찾o quando definido como 'no' ou para recodificar incondicionalmente em todos os subm처dulos preenchidos quando definido como 'yes', que 챕 o padr찾o quando essa op챌찾o 챕 usada sem qualquer valor. Use 'on-demand' para reciclar apenas em um subm처dulo preenchido quando o superprojeto recuperar uma confirma챌찾o que atualiza a refer챗ncia do subm처dulo para uma confirma챌찾o que ainda n찾o esteja no clone do subm처dulo local."
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr "--empregos=<n>"
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr "Desabilite a busca recursiva de subm처dulos (isto tem o mesmo efeito que usar a op챌찾o `--recurse-submodules=no`)."
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr "--subm처dulo-prefixo=<path>"
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr "Prefira <path> a caminhos impressos em mensagens informativas, como \"Buscando submodulo foo\". Essa op챌찾o 챕 usada internamente ao recorrer a subm처dulos."
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr "--recurso-subm처dulo-padr찾o=[sim|sob-demanda]"
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr "Essa op챌찾o 챕 usada internamente para fornecer temporariamente um valor padr찾o n찾o negativo para a op챌찾o --recurse-submodules. Todos os outros m챕todos de configura챌찾o da recurs찾o do subm처dulo da busca (como configura챌천es em linkgit:gitmodules[5] e linkgit:git-config[1]) sobrescrevem esta op챌찾o, assim como especificar - [no-]recurse-submodules diretamente."
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr "Por padr찾o, 'git fetch' se recusa a atualizar a cabe챌a que corresponde 횪 ramifica챌찾o atual. Este sinalizador desativa o cheque. Isto 챕 puramente para o uso interno de 'git pull' para se comunicar com 'git fetch', e a menos que voc챗 esteja implementando sua pr처pria Porcelana, voc챗 n찾o deve us찼-la."
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <pacote-para-envio>"
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr "Quando dado, e o reposit처rio para buscar 챕 manipulado por 'git fetch-pack', `--exec=<upload-pack>` 챕 passado para o comando para especificar o caminho n찾o padr찾o para o comando executado na outra extremidade."
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr "Passe - silencie para git-fetch-pack e silencie quaisquer outros comandos git usados internamente. O progresso n찾o 챕 relatado para o fluxo de erros padr찾o."
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "Seja verboso."
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "O status de progresso 챕 relatado no fluxo de erro padr찾o por padr찾o quando ele 챕 anexado a um terminal, a menos que -q seja especificado. Esse sinalizador for챌a o status de progresso mesmo se o fluxo de erro padr찾o n찾o for direcionado para um terminal."
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr "-o <option>"
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--servidor-op챌찾o=<option>"
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, fuzzy, priority:300
#| msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr "Transmita a string fornecida para o servidor ao se comunicar usando o protocolo vers찾o 2. A string fornecida n찾o deve conter um caractere NUL ou LF. Quando m첬ltiplos `--server-option=<option>` s찾o fornecidos, todos eles s찾o enviados para o outro lado na ordem listada na linha de comando."
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr "Use apenas endere챌os IPv4, ignorando endere챌os IPv6."
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr "Use apenas endere챌os IPv6, ignorando endere챌os IPv4."
@@ -5882,7 +5889,7 @@ msgstr ""
"\t [--chmod = (+ | -) x] [-] [<pathspec> ...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "DESCRI횉횄O"
@@ -5924,13 +5931,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "Por favor, veja linkgit:git-commit[1] para formas alternativas de adicionar conte첬do a um commit."
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "OP횉횛ES"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<pathspec>..."
@@ -5942,7 +5949,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr "Arquivos para adicionar conte첬do de. Fileglobs (por exemplo, `* .c`) podem ser fornecidos para adicionar todos os arquivos correspondentes. Tamb챕m um nome de diret처rio principal (por exemplo, `dir` para adicionar` dir/file1` e `dir/file2`) pode ser dado para atualizar o 챠ndice para corresponder ao estado atual do diret처rio como um todo (por exemplo, especificando` dir` ir찼 gravar n찾o apenas um arquivo `dir/file1` modificado na 찼rvore de trabalho, um arquivo `dir/file2` adicionado 횪 찼rvore de trabalho, mas tamb챕m um arquivo `dir /file3` removido da 찼rvore de trabalho). Note que vers천es mais antigas do Git costumavam ignorar arquivos removidos; use a op챌찾o `--no-all` se voc챗 quiser adicionar arquivos modificados ou novos, mas ignorar os removidos."
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "Para mais detalhes sobre a sintaxe <pathspec>, veja a entrada 'pathspec' em linkgit:gitglossary[7]."
@@ -5960,13 +5967,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "Permitir a adi챌찾o de arquivos ignorados."
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5990,13 +5997,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr "Isso efetivamente executa `add --interactive`, mas ignora o menu de comando inicial e pula diretamente para o subcomando` patch`. Veja `` modo interativo '' para detalhes."
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -6170,44 +6177,44 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr "Substituir o bit execut찼vel dos arquivos adicionados. O bit execut찼vel 챕 alterado apenas no 챠ndice, os arquivos no disco s찾o mantidos inalterados."
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, fuzzy, no-wrap, priority:300
#| msgid "--ignore-removal"
msgid "--pathspec-from-file=<file>"
msgstr "--ignore-removal"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr "Essa op챌찾o pode ser usada para separar as op챌천es da linha de comandos da lista de arquivos (첬til quando nomes de arquivo podem ser confundidos com op챌천es de linha de comando)."
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "EXEMPLOS"
@@ -6249,7 +6256,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr "Como este exemplo permite que o shell expanda o asterisco (ou seja, voc챗 est찼 listando os arquivos explicitamente), ele n찾o considera `subdir/git-foo.sh`."
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "MODO INTERATIVO"
@@ -6578,7 +6585,7 @@ msgid "modifying the contents of context or removal lines"
msgstr "modificando o conte첬do do contexto ou linhas de remo챌찾o"
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "VEJA TAMB횋M"
@@ -6590,13 +6597,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr "Parte do linkgit:git[1] suite"
@@ -6615,7 +6622,16 @@ msgstr "git-am - Aplica uma s챕rie de patches de uma caixa de correio"
#. type: Plain text
#: en/git-am.txt:20
-#, ignore-ellipsis, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#| msgid ""
+#| "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
+#| "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
+#| "\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n"
+#| "\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n"
+#| "\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
+#| "\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
+#| "\t [(<mbox> | <Maildir>)...]\n"
+#| "'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
msgid ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -6624,7 +6640,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
"'git am' [--signoff] [--manter] [--[n찾o-]manter-cr] [--[n찾o-]utf8]\n"
"\t[--[n찾o-]3caminho] [--interativo] [--committer-data-챕-autor-data]\n"
@@ -6654,7 +6670,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr "A lista de arquivos de caixa de correio para ler os patches. Se voc챗 n찾o fornecer esse argumento, o comando ler찼 a partir da entrada padr찾o. Se voc챗 fornecer diret처rios, eles ser찾o tratados como Maildirs."
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6696,7 +6712,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr "Com `--keep-cr`, chame 'git mailsplit' (veja linkgit:git-mailsplit[1]) com a mesma op챌찾o, para evitar que ele retire CR no final das linhas. A vari찼vel de configura챌찾o `am.keepcr` pode ser usada para especificar o comportamento padr찾o. `--no-keep-cr` 챕 첬til para sobrescrever` am.keepcr`."
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6726,7 +6742,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr "Ignore linhas de tesoura (veja linkgit:git-mailinfo[1])."
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6820,37 +6836,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr "Quando o patch n찾o se aplica corretamente, use a mesclagem de 3 vias se o patch registra a identidade dos blobs aos quais ele deve se aplicar e temos esses blobs dispon챠veis localmente. `--no-3way` pode ser usado para sobrescrever a vari찼vel de configura챌찾o am.threeWay. Para mais informa챌천es, veja am.threeWay em linkgit:git-config[1]."
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr "--espa챌oembranco=<op챌찾o>"
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr "-C<n>"
@@ -6910,7 +6926,7 @@ msgid "Run interactively."
msgstr "Corra interativamente."
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6922,7 +6938,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr "Por padr찾o, o comando registra a data da mensagem de e-mail como a data do autor de confirma챌찾o e usa a hora da cria챌찾o de confirma챌찾o como a data do committer. Isso permite ao usu찼rio mentir sobre a data do committer usando o mesmo valor da data do autor."
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6934,7 +6950,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr "Por padr찾o, o comando registra a data da mensagem de e-mail como a data do autor de confirma챌찾o e usa a hora da cria챌찾o de confirma챌찾o como a data do committer. Isso permite ao usu찼rio mentir sobre a data do autor usando o mesmo valor que a data do committer."
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6946,19 +6962,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr "Ignore o patch atual. Isso s처 챕 significativo ao reiniciar um patch abortado."
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr "-S[<keyid>]"
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr "--gpg-sinal[=<keyid>]"
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr "Confirma챌천es de assinatura de GPG. O argumento `keyid` 챕 opcional e padroniza a identidade do committer; se especificado, deve estar preso 횪 op챌찾o sem espa챌o."
@@ -6970,7 +6986,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7024,87 +7040,87 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr "Anule a opera챌찾o de corre챌찾o, mas mantenha HEAD e o 챠ndice inalterados."
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
-#, fuzzy, priority:100
-#| msgid "Show the patch being applied when \"git am\" is stopped because of conflicts."
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
-msgstr "Mostrar o patch sendo aplicado quando \"git am\" 챕 interrompido devido a conflitos."
+#: en/git-am.txt:184
+#, priority:100
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
+msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr "DISCUSS횄O"
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr "O nome do autor de confirma챌찾o 챕 retirado da linha \"De:\" da mensagem e a data do autor de envio 챕 obtida a partir da linha \"Data:\" da mensagem. A linha \"Assunto:\" 챕 usada como o t챠tulo da confirma챌찾o, ap처s remover o prefixo comum \"[PATCH <qualquer>>]\". A linha \"Assunto:\" deve descrever de forma concisa o que 챕 o compromisso em uma linha de texto."
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, fuzzy, priority:100
#| msgid "\"From: \" and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr "As linhas \"De:\" e \"Assunto:\" iniciando o corpo substituem os respectivos valores de nome e t챠tulo do autor de confirma챌찾o retirados dos cabe챌alhos."
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr "A mensagem de confirma챌찾o 챕 formada pelo t챠tulo obtido a partir do \"Assunto:\", uma linha em branco e o corpo da mensagem at챕 onde o patch come챌a. O excesso de espa챌o em branco no final de cada linha 챕 automaticamente eliminado."
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr "Espera-se que o patch esteja em linha, seguindo diretamente a mensagem. Qualquer linha que seja da forma:"
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr "tr챗s-tra챌os e fim-de-linha, ou"
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr "uma linha que come챌a com \"diff -\" ou"
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr "uma linha que come챌a com \"Index:\""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr "챕 tomado como o in챠cio de um patch, e a mensagem de log de confirma챌찾o 챕 finalizada antes da primeira ocorr챗ncia de tal linha."
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr "Ao invocar inicialmente o `git am`, voc챗 fornece os nomes das caixas de correio a serem processadas. Ao ver o primeiro patch que n찾o se aplica, ele aborta no meio. Voc챗 pode se recuperar disso de duas maneiras:"
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr "pule o patch atual reexecutando o comando com a op챌찾o `--skip`."
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
@@ -7112,31 +7128,31 @@ msgstr ""
" Ent찾o execute o comando com a op챌찾o `--continue`."
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr "O comando se recusa a processar novas caixas de correio at챕 que a opera챌찾o atual seja conclu챠da, portanto, se voc챗 decidir recome챌ar do zero, execute o `git am --abort` antes de executar o comando com nomes de caixa de correio."
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr "Antes que qualquer corre챌찾o seja aplicada, ORIG_HEAD 챕 definido como a ponta da ramifica챌찾o atual. Isso 챕 첬til se voc챗 tiver problemas com v찼rias confirma챌천es, como executar 'git am' na ramifica챌찾o errada ou um erro nas confirma챌천es mais facilmente corrigido alterando a caixa de correio (por exemplo, erros nas linhas \"De:\")."
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr "GANCHOS"
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr "Este comando pode executar os ganchos `applypatch-msg`,` pre-applypatch` e `post-applypatch`. Veja linkgit:githooks[5] para mais informa챌천es."
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -7230,7 +7246,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr "Os arquivos para ler o patch de. '-' pode ser usado para ler a entrada padr찾o."
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7260,8 +7276,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr "Em vez de aplicar o patch, verifique se o patch 챕 aplic찼vel 횪 찼rvore de trabalho atual e/ou ao arquivo de 챠ndice e detecta erros. Desativa \"aplicar\"."
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7272,7 +7288,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr "Quando `--check` estiver em vigor ou ao aplicar o patch (que 챕 o padr찾o quando nenhuma das op챌천es que o desativam estiver em vigor), certifique-se de que o patch seja aplic찼vel ao que o arquivo de 챠ndice atual registra. Se o arquivo a ser corrigido na 찼rvore de trabalho n찾o estiver atualizado, ele ser찼 marcado como um erro. Esse sinalizador tamb챕m faz com que o arquivo de 챠ndice seja atualizado."
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7346,7 +7362,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr "Remova os componentes do caminho principal <n> (separados por barras) dos caminhos tradicionais do diff. Por exemplo, com `-p2`, um patch contra` a/dir/file` ser찼 aplicado diretamente ao `file`. O padr찾o 챕 1."
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr "Assegure pelo menos <n> linhas de correspond챗ncia de contexto ao redor antes e depois de cada altera챌찾o. Quando menos linhas de contexto circundante existem, todas devem corresponder. Por padr찾o, nenhum contexto 챕 ignorado."
@@ -7369,8 +7385,8 @@ msgstr "Por padr찾o, 'git apply' espera que o patch sendo aplicado seja um diff
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr "Note, pelas raz천es expostas acima, o uso de patches livres de contexto 챕 desencorajado."
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7564,7 +7580,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr "Quando `git apply` 챕 usado como um \"melhor patch GNU\", o usu찼rio pode passar a op챌찾o` --unsafe-paths` para sobrescrever esta verifica챌찾o de seguran챌a. Esta op챌찾o n찾o tem efeito quando o `--index` ou` --cached` est찼 em uso."
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr "CONFIGURA횉횄O"
@@ -7594,7 +7610,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr "Quando nenhum sinalizador `--whitespace` 챕 fornecido a partir da linha de comandos, este item de configura챌찾o 챕 usado como padr찾o."
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr "SUBM횙DULOS"
@@ -7736,7 +7752,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr "Use a estrat챕gia de importa챌찾o de conjuntos de faixas r찼pida. Isso pode ser significativamente mais r찼pido para 찼rvores grandes, mas n찾o pode manipular altera챌천es de renomea챌찾o ou permiss천es de diret처rio. A estrat챕gia padr찾o 챕 lenta e segura."
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7928,7 +7944,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr "Usado com --remote para especificar o caminho para o 'git-upload-archive' no lado remoto."
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr "<tree-ish>"
@@ -9531,7 +9547,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr "Copie uma ramifica챌찾o e o reflogo correspondente."
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr "-C"
@@ -9555,7 +9571,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr "Desative as cores das ramifica챌천es, mesmo quando o arquivo de configura챌찾o fornecer a sa챠da padr찾o a cores. O mesmo que `--cor=nunca`."
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9847,7 +9863,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr "O novo nome para um ramo existente. As mesmas restri챌천es que para <branchnome> se aplicam."
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr "--ordenar=<chave>"
@@ -9971,7 +9987,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr "NOTAS"
@@ -10404,7 +10420,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr "No segundo formul찼rio, uma lista de objetos (separados por feeds de linha) 챕 fornecida em stdin, e o SHA-1, tipo e tamanho de cada objeto s찾o impressos em stdout. O formato de sa챠da pode ser substitu챠do usando o argumento opcional `<formato>`. Se `--textconv` ou` --filters` forem especificados, a entrada dever찼 listar os nomes dos objetos seguidos pelo nome do caminho, separados por um 첬nico espa챌o em branco, para que os drivers apropriados possam ser determinados."
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr "<objeto>"
@@ -10440,7 +10456,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr "Impress찾o-bonita o conte첬do de <objeto> baseado em seu tipo."
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr "<tipo>"
@@ -10665,7 +10681,7 @@ msgstr ""
"\t/etc/passwd\n"
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr "SA횒DA"
@@ -10999,13 +11015,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr "Considere `.gitattributos` apenas no 챠ndice, ignorando a 찼rvore de trabalho."
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr "Leia os nomes de caminho da entrada padr찾o, um por linha, em vez da linha de comando."
@@ -11096,7 +11112,7 @@ msgid "when a value has been assigned to the attribute."
msgstr "quando um valor foi atribu챠do ao atributo."
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr "Buffering acontece conforme documentado sob a op챌찾o `GIT_FLUSH` em linkgit:git[1]. O chamador 챕 respons찼vel por evitar deadlocks causados pelo excesso de buffer de entrada ou pela leitura de um buffer de sa챠da vazio."
@@ -11249,128 +11265,135 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
+#, fuzzy, priority:100
+#| msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr "Tamb챕m detalhes de sa챠da sobre o padr찾o correspondente (se houver) para cada nome de caminho fornecido. Para regras de preced챗ncia dentro e entre as fontes exclude, veja linkgit:gitignorar[5]."
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, fuzzy, priority:100
#| msgid "The output format is modified to be machine-parseable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr "O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina (veja abaixo). Se `--stdin` tamb챕m 챕 fornecido, os caminhos de entrada s찾o separados por um caractere NUL em vez de um caractere de alimenta챌찾o de linha."
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr "-n, --n찾o-coincidindo"
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr "Mostrar paths que n찾o correspondem a nenhum padr찾o.\t Isto s처 faz sentido quando o `--verbose` est찼 habilitado, caso contr찼rio n찾o seria poss챠vel distinguir entre caminhos que correspondem a um padr찾o e aqueles que n찾o o fazem."
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr "N찾o procure no 챠ndice ao realizar as verifica챌천es. Isso pode ser usado para depurar porque um caminho foi rastreado por, e. `git add .` e n찾o foi ignorado pelas regras como esperado pelo usu찼rio ou ao desenvolver padr천es incluindo nega챌찾o para corresponder a um caminho previamente adicionado com` git add -f`."
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr "Por padr찾o, qualquer um dos nomes de caminho fornecidos que correspondem a um padr찾o de ignorar ser찼 gerado, um por linha. Se nenhum padr찾o corresponder a um determinado caminho, nada ser찼 produzido para esse caminho; isso significa que o caminho n찾o ser찼 ignorado."
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr "Se `--verbose` for especificado, a sa챠da ser찼 uma s챕rie de linhas do formul찼rio:"
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr "<origem> <COLON> <linenum> <COLON> <padr찾o> <HT> <nome do path>"
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr "<pathnome> 챕 o path de um arquivo sendo consultado, <padronizar> 챕 o padr찾o correspondente, <fonte> 챕 o arquivo de origem do padr찾o e <n첬mero-de-linha> 챕 o n첬mero da linha do padr찾o dentro dessa origem. Se o padr찾o continha um prefixo `!` Ou `/`, ele ser찼 preservado na sa챠da. <fonte> ser찼 um caminho absoluto quando se referir ao arquivo configurado por `core.excluirArquivo`, ou relativo 횪 raiz do reposit처rio quando se referir a` .git/info/excluir` ou um arquivo de exclus찾o por diret처rio."
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr "Se `-z` for especificado, os nomes de caminho na sa챠da s찾o delimitados pelo caractere nulo; se `--verbose` tamb챕m for especificado, ent찾o caracteres nulos tamb챕m ser찾o usados em vez de v챠rgulas e guias r챠gidas:"
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr "<fonte> <NULL> <n첬mero de linhas> <NULL> <padr찾o> <NULL> <nome do path> <NULL>"
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr "Se `-n` ou` --n찾o-coincidindo` forem especificados, nomes de caminhos n찾o correspondentes tamb챕m ser찾o emitidos, caso em que todos os campos em cada registro de sa챠da, exceto para <nome do path>, estar찾o vazios. Isso pode ser 첬til ao executar de forma n찾o interativa, para que os arquivos possam ser transmitidos de forma incremental para STDIN de um processo de ignorar cheque de longa execu챌찾o e, para cada um desses arquivos, STDOUT indicar찼 se esse arquivo correspondeu a um padr찾o. (Sem essa op챌찾o, seria imposs챠vel dizer se a aus챗ncia de sa챠da para um determinado arquivo significava que ele n찾o correspondia a nenhum padr찾o ou que a sa챠da ainda n찾o havia sido gerada.)"
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr "ESTADO DE SA횒DA"
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr "Um ou mais dos caminhos fornecidos s찾o ignorados."
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr "Nenhum dos caminhos fornecidos 챕 ignorado."
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr "Um erro fatal foi encontrado."
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11861,7 +11884,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr "Isso 챕 semelhante ao \"verificar paths para a 찼rvore de trabalho do modo de 챠ndice ou de 찼rvore-ish\" descrito acima, mas permite usar a interface interativa para mostrar a sa챠da \"diff\" e escolher quais blocos usar no resultado. Veja abaixo a descri챌찾o da op챌찾o `--patch`."
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr "Silencioso, suprima as mensagens de feedback."
@@ -12066,7 +12089,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr "No modo de checkout esparso, `git checkout - <paths>` atualizaria apenas entradas correspondidas por <paths> e padr천es esparsos em $GIT_DIR/info/sparse-checkout. Esta op챌찾o ignora os padr천es esparsos e adiciona de volta os arquivos em <paths>."
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -12259,7 +12282,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, fuzzy, priority:280
#| msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
@@ -13039,7 +13062,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr "Por padr찾o, a escolha aleat처ria de uma confirma챌찾o vazia falhar찼, indicando que uma chamada expl챠cita de `git commit --allow-empty` 챕 necess찼ria. Essa op챌찾o substitui esse comportamento, permitindo que os commits vazios sejam preservados automaticamente em um cherry-pick. Observe que quando \"--ff\" est찼 em vigor, os commits vazios que atendem ao requisito de \"fast forward\" ser찾o mantidos mesmo sem essa op챌찾o. Observe tamb챕m que o uso desta op챌찾o mant챕m apenas confirma챌천es que estavam inicialmente vazias (isto 챕, o commit registrou a mesma 찼rvore que seu pai). Commits que s찾o feitos em branco devido a um commit anterior s찾o descartados. Para for챌ar a inclus찾o desses commits use `--keep-redundant-commits`."
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -13065,7 +13088,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr "Se um commit que est찼 sendo escolhido, duplicar um commit j찼 no hist처rico atual, ele ficar찼 vazio. Por padr찾o, estas confirma챌천es redundantes fazem com que o `cherry-pick` pare para que o usu찼rio possa examinar o commit. Esta op챌찾o substitui esse comportamento e cria um objeto de confirma챌찾o vazio. Implica `--allow-empty`."
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -13291,7 +13314,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr "Ramifica챌찾o upstream para procurar confirma챌천es equivalentes. Padr찾o para o ramo de upstream de HEAD."
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13877,7 +13900,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr "Nenhum checkout de HEAD 챕 executado ap처s o clone estar completo."
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -14024,7 +14047,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -14120,7 +14143,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -14418,7 +14441,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14478,89 +14501,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14767,7 +14766,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14863,7 +14862,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -15166,13 +15165,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -15182,13 +15181,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -15197,19 +15196,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -15219,31 +15218,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -15253,55 +15252,110 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, fuzzy, no-wrap, priority:280
+#| msgid "CONFIGURATION"
+msgid "COMMIT INFORMATION"
+msgstr "CONFIGURA횉횄O"
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15322,18 +15376,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15516,7 +15570,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr "Para op챌천es de leitura: leia somente do global `~/.gitconfig` e de` $XDG_CONFIG_HOME/git/config` ao inv챕s de todos os arquivos dispon챠veis."
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr "Veja tamb챕m << FILES >>."
@@ -15776,12 +15830,24 @@ msgstr "Aumente a sa챠da de todas as op챌천es de configura챌찾o consultadas com
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr "--get-colorbool nome [stdout-챕-tty]"
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
@@ -15789,194 +15855,194 @@ msgstr ""
" `stdout-챕-tty` deve ser\" true \"ou\" false \", e 챕 levado em conta quando a configura챌찾o diz\" auto \". Se stdout-챕-tty est찼 faltando, ent찾o verifica a sa챠da padr찾o do pr처prio comando e sai com o status 0 se a cor for usada ou sai com o status 1 caso contr찼rio. Quando a configura챌찾o de cor para `nome` 챕 indefinida, o comando usa` color.ui` como fallback."
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr "--get-color nome [padr찾o]"
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr "Encontre a cor configurada para `nome` (por exemplo,` color.diff.new`) e imprima-a como a sequ챗ncia de escape de cor ANSI para a sa챠da padr찾o. O par창metro opcional `padr찾o` 챕 usado em vez disso, se n찾o houver cor configurada para` nome`."
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, fuzzy, priority:100
#| msgid "`--type=color [--default=<default>]` is preferred over `--get-color`."
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr "`--tipo=color [--padr찾o=<padr찾o>]` 챕 prefer챠vel `--get-color`."
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr "Abre um editor para modificar o arquivo de configura챌찾o especificado; ou `--sistema`,` --global` ou reposit처rio (padr찾o)."
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr "Respeite as diretivas `include.*` Nos arquivos de configura챌찾o ao procurar valores. O padr찾o 챕 `off` quando um arquivo espec챠fico 챕 dado (por exemplo, usando` --file`, `--global`, etc) e` on` ao procurar todos os arquivos de configura챌찾o."
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr "--padr찾o <valor>"
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr "Ao usar `--get` e a vari찼vel solicitada n찾o for encontrada, comportar-se como se <valor> fosse o valor atribu챠do 횪 vari찼vel."
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr "O `pager.config` 챕 somente respeitado ao listar a configura챌찾o, ou seja, ao usar` --list` ou qualquer um dos `--get-*` que pode retornar m첬ltiplos resultados. O padr찾o 챕 usar um pager."
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr "Se n찾o for definido explicitamente com `--file`, existem quatro arquivos em que 'git config' procurar찼 op챌천es de configura챌찾o:"
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr "$(prefixo)/etc/gitconfig"
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr "Arquivo de configura챌찾o do sistema."
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr "Segundo arquivo de configura챌찾o espec챠fico do usu찼rio. Se $ XDG_CONFIG_HOME n찾o estiver definido ou vazio, o `$HOME/.config/git/config` ser찼 usado. Qualquer vari찼vel de valor 첬nico definida neste arquivo ser찼 sobrescrita pelo que estiver em `~/.gitconfig`. 횋 uma boa ideia n찾o criar este arquivo se voc챗, 횪s vezes, usa vers천es mais antigas do Git, j찼 que o suporte para esse arquivo foi adicionado recentemente."
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr "Arquivo de configura챌찾o espec챠fico do usu찼rio. Tamb챕m chamado de arquivo de configura챌찾o \"global\"."
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr "Arquivo de configura챌찾o espec챠fico do reposit처rio."
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr "$GIT_DIR/config.찼rvore-de-trabalho"
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr "Isso 챕 opcional e s처 챕 pesquisado quando o arquivo `extensions.worktreeConfig` est찼 presente em $GIT_DIR/config."
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr "Se nenhuma outra op챌찾o for fornecida, todas as op챌천es de leitura ler찾o todos esses arquivos dispon챠veis. Se o arquivo de configura챌찾o global ou do sistema n찾o estiver dispon챠vel, eles ser찾o ignorados. Se o arquivo de configura챌찾o do reposit처rio n찾o estiver dispon챠vel ou leg챠vel, o 'git config' ser찼 encerrado com um c처digo de erro diferente de zero. No entanto, em nenhum dos casos, ser찼 emitida uma mensagem de erro."
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr "Os arquivos s찾o lidos na ordem dada acima, com o 첬ltimo valor encontrado tendo preced챗ncia sobre os valores lidos anteriormente. Quando v찼rios valores s찾o obtidos, todos os valores de uma chave de todos os arquivos ser찾o usados."
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr "Voc챗 pode sobrescrever par창metros de configura챌찾o individuais ao executar qualquer comando git usando a op챌찾o `-c`. Veja linkgit:git[1] para detalhes."
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr "Todas as op챌천es de grava챌찾o por padr찾o gravar찾o no arquivo de configura챌찾o espec챠fico do reposit처rio. Note que isto tamb챕m afeta op챌천es como `--replace-all` e` --unset`. *'git config' sempre mudar찼 apenas um arquivo de cada vez*."
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr "Voc챗 pode substituir essas regras por op챌천es de linha de comando ou por vari찼veis de ambiente. As op챌천es `--global`,` --system` e `--찼rvore de trabalho` limitar찾o o arquivo usado para o arquivo global, em todo o sistema ou por 찼rvore de trabalho, respectivamente. A vari찼vel de ambiente `GIT_CONFIG` tem um efeito similar, mas voc챗 pode especificar qualquer nome de arquivo desejado."
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr "MEIO AMBIENTE"
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr "Pegue a configura챌찾o do arquivo fornecido em vez de .git/config. Usar a op챌찾o \"--global\" for챌a isso para ~/.gitconfig. Usar a op챌찾o \"--system\" for챌a isso para $(prefixo)/etc/gitconfig."
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr "Se deve ignorar as configura챌천es de leitura do arquivo $/etc/gitconfig do sistema (prefixo). Veja linkgit:git[1] para detalhes."
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr "Dado um .git/config como este:"
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15987,7 +16053,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15997,7 +16063,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t# Our diff algorithm\n"
@@ -16016,7 +16082,7 @@ msgstr ""
"\t\trenames = true\n"
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, fuzzy, no-wrap, priority:100
#| msgid ""
#| "\t# Proxy settings\n"
@@ -16035,7 +16101,7 @@ msgstr ""
"\t\tgitProxy=default-proxy; para o resto\n"
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -16047,157 +16113,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -16207,13 +16273,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16226,19 +16292,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16246,13 +16312,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16339,7 +16405,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19672,7 +19738,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22943,7 +23009,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -23332,7 +23398,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -24091,7 +24157,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24710,7 +24776,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26476,7 +26542,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26846,7 +26912,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26922,575 +26988,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27528,7 +27612,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -31043,7 +31127,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -31109,7 +31193,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -31234,97 +31318,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr "Transmita a string fornecida para o servidor ao se comunicar usando o protocolo vers찾o 2. A string fornecida n찾o deve conter um caractere NUL ou LF. Quando m첬ltiplos `--server-option=<option>` s찾o fornecidos, todos eles s찾o enviados para o outro lado na ordem listada na linha de comando."
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -31345,7 +31429,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31853,7 +31937,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33725,7 +33809,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36606,13 +36690,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38750,7 +38834,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38780,487 +38864,559 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:294
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:300
+#, fuzzy, priority:100
+#| msgid "By default, cherry-picking a commit with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be cherry picked."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
+msgstr ""
+"Por padr찾o, escolher um commit com uma mensagem vazia falhar찼. \n"
+" Essa op챌찾o substitui esse comportamento, permitindo que as confirma챌천es de mensagens vazias sejam selecionadas."
+
+#. type: Plain text
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, fuzzy, priority:100
+#| msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr "Assegure pelo menos <n> linhas de correspond챗ncia de contexto ao redor antes e depois de cada altera챌찾o. Quando menos linhas de contexto circundante existem, todas devem corresponder. Por padr찾o, nenhum contexto 챕 ignorado."
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
-#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
-msgstr ""
+#: en/git-rebase.txt:429
+#, fuzzy, priority:100
+#| msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
+msgstr "Esses sinalizadores s찾o passados para o programa 'git apply' (ver linkgit:git-apply 1]) que aplica o patch."
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -39268,27 +39424,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -39296,154 +39454,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
+#, no-wrap, priority:100
+msgid ""
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39452,73 +39795,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39529,25 +39872,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39560,31 +39903,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39598,85 +39941,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39687,13 +40030,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39704,13 +40047,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39721,73 +40064,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39798,19 +40141,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39820,67 +40163,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39894,25 +40237,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39923,7 +40266,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39933,7 +40276,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39942,55 +40285,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -40001,13 +40344,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -40015,7 +40358,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40027,7 +40370,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40036,37 +40379,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42647,7 +42990,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -44406,223 +44749,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -47151,7 +47491,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -47161,6 +47501,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -47168,97 +47509,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -47266,139 +47577,236 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, fuzzy, priority:240
+#| msgid "This option is only applicable in non-verbose mode."
+msgid "This option is only valid for `push` command."
+msgstr "Esta op챌찾o 챕 aplic찼vel apenas no modo n찾o detalhado."
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -47407,31 +47815,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -47443,13 +47851,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47464,13 +47872,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47482,19 +47890,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47509,19 +47917,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47530,7 +47938,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48510,7 +48918,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48688,7 +49096,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48966,19 +49374,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51641,7 +52055,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -52079,311 +52493,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -52392,7 +52818,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -52402,613 +52828,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -53023,523 +53485,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -54519,7 +54981,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58863,7 +59337,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, fuzzy, priority:260
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
@@ -59298,185 +59772,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -59486,7 +59972,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -59496,13 +59982,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -62488,6 +62974,10 @@ msgstr ""
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+#, fuzzy
+#~ msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+#~ msgstr "Mostrar o patch sendo aplicado quando \"git am\" 챕 interrompido devido a conflitos."
+
#~ msgid "Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected, and therefore the interactive Git protocols (git, ssh, http) cannot be used. This command provides support for 'git fetch' and 'git pull' to operate by packaging objects and references in an archive at the originating machine, then importing those into another repository using 'git fetch' and 'git pull' after moving the archive by some means (e.g., by sneakernet). As no direct connection between the repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the destination repository."
#~ msgstr "Alguns fluxos de trabalho exigem que um ou mais ramos de desenvolvimento em uma m찼quina sejam replicados em outra m찼quina, mas as duas m찼quinas n찾o podem ser conectadas diretamente e, portanto, os protocolos Git interativos (git, ssh, http) n찾o podem ser usados. Este comando fornece suporte para 'git fetch' e 'git pull' para operar empacotando objetos e refer챗ncias em um arquivo na m찼quina de origem, importando-os em outro reposit처rio usando 'git fetch' e 'git pull' ap처s mover o arquivo por alguns meios (por exemplo, por sneakernet). Como n찾o existe conex찾o direta entre os reposit처rios, o usu찼rio deve especificar uma base para o bundle que 챕 mantido pelo reposit처rio de destino: o bundle assume que todos os objetos na base j찼 est찾o no reposit처rio de destino."
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 2086272..feb61e8 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-02-08 19:43+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: pt_PT\n"
@@ -28,7 +28,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -76,7 +76,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -124,7 +124,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -274,7 +274,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -706,7 +706,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1653,8 +1653,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2449,61 +2449,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3537,7 +3537,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3549,13 +3549,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4016,7 +4016,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4048,7 +4048,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4084,7 +4084,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4104,7 +4104,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4716,15 +4716,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4854,13 +4854,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4896,7 +4896,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4938,13 +4938,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4956,7 +4956,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4968,7 +4968,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5004,13 +5004,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5100,7 +5100,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5232,7 +5232,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5244,13 +5244,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5282,7 +5282,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5354,7 +5354,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5372,7 +5372,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5396,253 +5396,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5683,7 +5683,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5725,13 +5725,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5743,7 +5743,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5761,13 +5761,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5791,13 +5791,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5971,43 +5971,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6049,7 +6049,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6373,13 +6373,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6407,7 +6407,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6429,7 +6429,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6471,7 +6471,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6501,7 +6501,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6593,37 +6593,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6683,7 +6683,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6695,7 +6695,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6707,7 +6707,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6719,19 +6719,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6743,7 +6743,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6797,115 +6797,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6991,7 +6992,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7021,8 +7022,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7033,7 +7034,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7105,7 +7106,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7128,8 +7129,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7321,7 +7322,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7351,7 +7352,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7491,7 +7492,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7681,7 +7682,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9243,7 +9244,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9267,7 +9268,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9555,7 +9556,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9679,7 +9680,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10092,7 +10093,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10128,7 +10129,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10347,7 +10348,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10671,13 +10672,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10767,7 +10768,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10918,127 +10919,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11514,7 +11521,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11706,7 +11713,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11892,7 +11899,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12628,7 +12635,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12652,7 +12659,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12878,7 +12885,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13444,7 +13451,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13588,7 +13595,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13684,7 +13691,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13982,7 +13989,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14042,89 +14049,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14331,7 +14314,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14427,7 +14410,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14730,13 +14713,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14746,13 +14729,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14761,19 +14744,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14783,31 +14766,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14817,55 +14800,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14886,18 +14923,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15078,7 +15115,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15337,204 +15374,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15545,7 +15594,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15555,7 +15604,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15565,7 +15614,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15575,7 +15624,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15587,157 +15636,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15747,13 +15796,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15766,19 +15815,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15786,13 +15835,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15879,7 +15928,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19212,7 +19261,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22483,7 +22532,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22872,7 +22921,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23631,7 +23680,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24250,7 +24299,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26014,7 +26063,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26384,7 +26433,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26460,575 +26509,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27066,7 +27133,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30580,7 +30647,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30646,7 +30713,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30771,97 +30838,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30882,7 +30949,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31390,7 +31457,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33261,7 +33328,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36142,13 +36209,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38286,7 +38353,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38316,487 +38383,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38804,27 +38938,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38832,154 +38968,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38988,73 +39309,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39065,25 +39386,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39096,31 +39417,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39134,85 +39455,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39223,13 +39544,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39240,13 +39561,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39257,73 +39578,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39334,19 +39655,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39356,67 +39677,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39430,25 +39751,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39459,7 +39780,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39469,7 +39790,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39478,55 +39799,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39537,13 +39858,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39551,7 +39872,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39563,7 +39884,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39572,37 +39893,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42173,7 +42494,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43905,223 +44226,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, fuzzy, priority:280
msgid "See linkgit:git-add[1]."
msgstr "linkgit:git-add[1]"
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46650,7 +46968,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46660,6 +46978,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46667,97 +46986,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46765,139 +47054,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46906,31 +47291,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46942,13 +47327,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46963,13 +47348,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46981,19 +47366,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47008,19 +47393,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47029,7 +47414,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48009,7 +48394,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48187,7 +48572,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48464,19 +48849,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51099,7 +51490,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, fuzzy, no-wrap, priority:240
msgid "<commit>"
msgstr "`commit`"
@@ -51537,311 +51928,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51850,7 +52253,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51860,613 +52263,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
-#, fuzzy, priority:100
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "linkgit:git-commit-tree[1]"
+#: en/git.txt:529
+#, priority:100
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52481,523 +52920,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53977,7 +54416,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58310,7 +58761,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58738,185 +59189,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58926,7 +59389,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58936,13 +59399,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -61927,3 +62390,7 @@ msgstr ""
#, priority:300
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+
+#, fuzzy
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 9c2283b..70a2c23 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-03-19 21:36+0000\n"
"Last-Translator: Dexter Morganov <dexter.morganov@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,8 +13,7 @@ msgstr ""
"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"
+"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.0-dev\n"
#. type: Labeled list
@@ -30,7 +29,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -78,7 +77,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -90,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -126,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -277,7 +276,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -322,9 +321,7 @@ msgstr "linkgit:git-count-objects[1]"
#: en/cmds-ancillaryinterrogators.txt:9
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
-msgstr ""
-"�棘畇��筠� 克棘剋龜�筠��勻逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 龜 極棘��筠閨剋筠戟龜� 龜劇龜 畇龜�克棘勻棘均棘 "
-"極�棘���逵戟��勻逵."
+msgstr "�棘畇��筠� 克棘剋龜�筠��勻逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 龜 極棘��筠閨剋筠戟龜� 龜劇龜 畇龜�克棘勻棘均棘 極�棘���逵戟��勻逵."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
@@ -711,7 +708,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr "�勻����棘�棘戟戟龜筠 棘極筠�逵�龜龜 劇筠菌畇� �筠極棘鈞龜�棘�龜�劇龜 Subversion 龜 Git."
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1658,8 +1655,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr "�筠鈞棘極逵�戟棘筠 棘閨戟棘勻剋筠戟龜筠 龜劇筠戟龜 棘閨�筠克�逵 ��逵戟��筠均棘�� 勻 ���剋克筠"
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1824,8 +1821,7 @@ msgstr "linkgit:git-merge-one-file[1]"
#: en/cmds-purehelpers.txt:39
#, priority:100
msgid "The standard helper program to use with git-merge-index."
-msgstr ""
-"鬼�逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克 畇剋� 龜�極棘剋�鈞棘勻逵戟龜� �棘勻劇筠��戟棘 � git-merge-index."
+msgstr "鬼�逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克 畇剋� 龜�極棘剋�鈞棘勻逵戟龜� �棘勻劇筠��戟棘 � git-merge-index."
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
@@ -2455,61 +2451,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3543,7 +3539,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3555,13 +3551,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4022,7 +4018,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4054,7 +4050,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4090,7 +4086,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4110,7 +4106,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4722,15 +4718,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4860,13 +4856,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4902,7 +4898,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4944,13 +4940,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr "-W"
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4962,7 +4958,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4974,7 +4970,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5010,13 +5006,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5106,7 +5102,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5238,7 +5234,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5250,13 +5246,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5288,7 +5284,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5360,7 +5356,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5378,7 +5374,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5402,253 +5398,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <極���>"
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "���� 劇戟棘均棘�剋棘勻戟筠筠."
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--server-option=<棘極�龜�>"
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr "��極棘剋�鈞棘勻逵�� �棘剋�克棘 IPv4 畇�筠�逵, 龜均戟棘�龜��� IPv6 逵畇�筠�逵."
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr "��極棘剋�鈞棘勻逵�� �棘剋�克棘 IPv6 逵畇�筠�逵, 龜均戟棘�龜��� 逵畇�筠�逵 IPv4."
@@ -5687,16 +5683,14 @@ msgid ""
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
-"-i] [--patch | -p]\n"
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
-"[--renormalize]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
"\t [--chmod=(+|-)x] [--pathspec-from-file=<�逵橘剋> [--pathspec-file-nul]]\n"
"\t [--] [<�極筠�龜�龜克逵�棘�-極��龜>...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "���鬼����"
@@ -5723,9 +5717,7 @@ msgstr ""
#: en/git-add.txt:39
#, priority:300
msgid "The `git status` command can be used to obtain a summary of which files have changes that are staged for the next commit."
-msgstr ""
-"�棘劇逵戟畇逵 `git status` 劇棘菌筠� 閨��� 龜�極棘剋�鈞棘勻逵戟逵 畇剋� 極棘剋��筠戟龜� 龜戟�棘�劇逵�龜龜 棘 �棘劇, "
-"克逵克龜筠 �逵橘剋� �棘畇筠�菌逵� 龜鈞劇筠戟筠戟龜�, 極棘畇均棘�棘勻剋筠戟戟�筠 畇剋� �剋筠畇���筠均棘 克棘劇劇龜�逵."
+msgstr "�棘劇逵戟畇逵 `git status` 劇棘菌筠� 閨��� 龜�極棘剋�鈞棘勻逵戟逵 畇剋� 極棘剋��筠戟龜� 龜戟�棘�劇逵�龜龜 棘 �棘劇, 克逵克龜筠 �逵橘剋� �棘畇筠�菌逵� 龜鈞劇筠戟筠戟龜�, 極棘畇均棘�棘勻剋筠戟戟�筠 畇剋� �剋筠畇���筠均棘 克棘劇劇龜�逵."
#. type: Plain text
#: en/git-add.txt:46
@@ -5737,18 +5729,16 @@ msgstr ""
#: en/git-add.txt:49
#, priority:300
msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a commit."
-msgstr ""
-"�棘 ���剋克筠 linkgit:git-commit[1] 畇棘���極戟� 逵剋��筠�戟逵�龜勻戟�筠 極��龜 畇棘閨逵勻剋筠戟龜� "
-"�逵橘剋棘勻 勻 克棘劇劇龜�."
+msgstr "�棘 ���剋克筠 linkgit:git-commit[1] 畇棘���極戟� 逵剋��筠�戟逵�龜勻戟�筠 極��龜 畇棘閨逵勻剋筠戟龜� �逵橘剋棘勻 勻 克棘劇劇龜�."
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "������龜�竅"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<�極筠�龜�龜克逵�棘�-極��龜>��"
@@ -5760,20 +5750,16 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
-msgstr ""
-"�棘剋筠筠 畇筠�逵剋�戟棘 �龜戟�逵克�龜� <�極筠�龜�龜克逵�棘�逵-極��龜> �逵��劇逵��龜勻逵筠��� 勻 �逵鈞畇筠剋筠 "
-"'pathspec' 勻 linkgit:gitglossary[7]."
+msgstr "�棘剋筠筠 畇筠�逵剋�戟棘 �龜戟�逵克�龜� <�極筠�龜�龜克逵�棘�逵-極��龜> �逵��劇逵��龜勻逵筠��� 勻 �逵鈞畇筠剋筠 'pathspec' 勻 linkgit:gitglossary[7]."
#. type: Plain text
#: en/git-add.txt:73
#, priority:300
msgid "Don't actually add the file(s), just show if they exist and/or will be ignored."
-msgstr ""
-"�筠 畇棘閨逵勻剋��� �克逵鈞逵戟戟�筠 �逵橘剋(�) 戟逵 �逵劇棘劇 畇筠剋筠, 逵 極�棘��棘 極棘克逵鈞逵��, ���筠��勻��� "
-"剋龜 棘戟龜 龜/龜剋龜 閨�畇�� 剋龜 極�棘龜均戟棘�龜�棘勻逵戟�."
+msgstr "�筠 畇棘閨逵勻剋��� �克逵鈞逵戟戟�筠 �逵橘剋(�) 戟逵 �逵劇棘劇 畇筠剋筠, 逵 極�棘��棘 極棘克逵鈞逵��, ���筠��勻��� 剋龜 棘戟龜 龜/龜剋龜 閨�畇�� 剋龜 極�棘龜均戟棘�龜�棘勻逵戟�."
#. type: Plain text
#: en/git-add.txt:81
@@ -5782,13 +5768,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "�逵鈞�筠�龜�� 畇棘閨逵勻剋筠戟龜筠 �逵橘剋棘勻, 克棘�棘��筠 龜戟逵�筠 閨�剋龜 閨� 極�棘龜均戟棘�龜�棘勻逵戟�."
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5812,13 +5798,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5992,43 +5978,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr "--pathspec-from-file=<�逵橘剋>"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "������竅"
@@ -6070,7 +6056,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "��龜����龜���竅� �����"
@@ -6269,9 +6255,7 @@ msgstr "diff"
#: en/git-add.txt:354
#, priority:300
msgid "This lets you review what will be committed (i.e. between HEAD and index)."
-msgstr ""
-"葵�棘 極棘鈞勻棘剋�筠� 勻逵劇 �勻龜畇筠��, ��棘 閨�畇筠� 勻克剋��筠戟棘 勻 克棘劇劇龜� (�棘 筠��� �逵鈞戟龜�� "
-"劇筠菌畇� HEAD 龜 龜戟畇筠克�棘劇)."
+msgstr "葵�棘 極棘鈞勻棘剋�筠� 勻逵劇 �勻龜畇筠��, ��棘 閨�畇筠� 勻克剋��筠戟棘 勻 克棘劇劇龜� (�棘 筠��� �逵鈞戟龜�� 劇筠菌畇� HEAD 龜 龜戟畇筠克�棘劇)."
#. type: Title -
#: en/git-add.txt:357
@@ -6394,7 +6378,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "鬼��龜�� 龜����"
@@ -6406,13 +6390,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr "赳勻剋�筠��� �逵���� 極逵克筠�逵 linkgit:git[1]"
@@ -6431,7 +6415,16 @@ msgstr "��龜劇筠戟筠戟龜筠 �筠�龜龜 極逵��筠橘 龜鈞 極棘��棘勻棘均棘 �
#. type: Plain text
#: en/git-am.txt:20
-#, ignore-ellipsis, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#| msgid ""
+#| "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
+#| "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
+#| "\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n"
+#| "\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n"
+#| "\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
+#| "\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
+#| "\t [(<mbox> | <Maildir>)...]\n"
+#| "'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
msgid ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -6440,7 +6433,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -6470,7 +6463,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6512,7 +6505,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6542,7 +6535,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6634,37 +6627,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6724,7 +6717,7 @@ msgid "Run interactively."
msgstr "鈞逵極���龜�� 勻 龜戟�筠�逵克�龜勻戟棘劇 �筠菌龜劇筠"
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6736,7 +6729,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6748,7 +6741,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6760,19 +6753,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6784,7 +6777,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6838,115 +6831,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6973,21 +6967,13 @@ msgstr "'git annotate' [<棘極�龜龜>] <�逵橘剋> [<�筠勻龜鈞龜�>]\n"
#: en/git-annotate.txt:17
#, priority:100
msgid "Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision."
-msgstr ""
-"�戟戟棘�龜��筠� 克逵菌畇�� ���棘克� 鈞逵畇逵戟戟棘均棘 �逵橘剋逵 龜戟�棘�劇逵�龜筠橘 龜鈞 克棘劇劇龜�逵, 克棘�棘��橘 "
-"畇棘閨逵勻龜剋 畇逵戟戟�� ���棘克�. �棘 菌筠剋逵戟龜�, 劇棘菌戟棘 逵戟戟棘�龜�棘勻逵�� 戟逵 棘�戟棘勻筠 鈞逵畇逵戟戟棘橘 "
-"�筠勻龜鈞龜龜."
+msgstr "�戟戟棘�龜��筠� 克逵菌畇�� ���棘克� 鈞逵畇逵戟戟棘均棘 �逵橘剋逵 龜戟�棘�劇逵�龜筠橘 龜鈞 克棘劇劇龜�逵, 克棘�棘��橘 畇棘閨逵勻龜剋 畇逵戟戟�� ���棘克�. �棘 菌筠剋逵戟龜�, 劇棘菌戟棘 逵戟戟棘�龜�棘勻逵�� 戟逵 棘�戟棘勻筠 鈞逵畇逵戟戟棘橘 �筠勻龜鈞龜龜."
#. type: Plain text
#: en/git-annotate.txt:22
#, priority:100
msgid "The only difference between this command and linkgit:git-blame[1] is that they use slightly different output formats, and this command exists only for backward compatibility to support existing scripts, and provide a more familiar command name for people coming from other SCM systems."
-msgstr ""
-"�畇龜戟��勻筠戟戟逵� �逵鈞戟龜�逵 劇筠菌畇� 畇逵戟戟棘橘 克棘劇逵戟畇棘橘 龜 linkgit:git-blame[1] 勻 �棘劇, ��棘 "
-"龜� �棘�劇逵� 勻�勻棘畇逵 戟筠�克棘剋�克棘 棘�剋龜�逵筠���. �逵戟戟逵� 克棘劇逵戟畇逵 ���筠��勻�筠� �棘剋�克棘 �逵畇龜 "
-"棘閨�逵�戟棘橘 �棘勻劇筠��龜劇棘��龜 龜 畇剋� 極棘畇畇筠�菌克龜 �菌筠 ���筠��勻���龜� ��筠戟逵�龜筠勻, 逵 �逵克菌筠 "
-"畇逵閨� 極�筠畇棘��逵勻龜�� 克棘劇逵戟畇� �棘 鈞戟逵克棘劇�劇 龜劇筠戟筠劇 剋�畇�劇 鈞戟逵克棘劇�劇 � 畇��均龜劇龜 "
-"�龜��筠劇逵 �極�逵勻剋筠戟龜� 勻筠��龜橘."
+msgstr "�畇龜戟��勻筠戟戟逵� �逵鈞戟龜�逵 劇筠菌畇� 畇逵戟戟棘橘 克棘劇逵戟畇棘橘 龜 linkgit:git-blame[1] 勻 �棘劇, ��棘 龜� �棘�劇逵� 勻�勻棘畇逵 戟筠�克棘剋�克棘 棘�剋龜�逵筠���. �逵戟戟逵� 克棘劇逵戟畇逵 ���筠��勻�筠� �棘剋�克棘 �逵畇龜 棘閨�逵�戟棘橘 �棘勻劇筠��龜劇棘��龜 龜 畇剋� 極棘畇畇筠�菌克龜 �菌筠 ���筠��勻���龜� ��筠戟逵�龜筠勻, 逵 �逵克菌筠 畇逵閨� 極�筠畇棘��逵勻龜�� 克棘劇逵戟畇� �棘 鈞戟逵克棘劇�劇 龜劇筠戟筠劇 剋�畇�劇 鈞戟逵克棘劇�劇 � 畇��均龜劇龜 �龜��筠劇逵 �極�逵勻剋筠戟龜� 勻筠��龜橘."
#. type: Title =
#: en/git-apply.txt:2
@@ -7040,7 +7026,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7070,8 +7056,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7082,7 +7068,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7154,7 +7140,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7177,8 +7163,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7370,7 +7356,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr "���圭��叫��揆�赳"
@@ -7400,7 +7386,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7540,7 +7526,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7730,7 +7716,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, fuzzy, no-wrap, priority:240
msgid "<tree-ish>"
msgstr "�克逵鈞逵�筠剋�-畇筠�筠勻逵"
@@ -9292,7 +9278,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9316,7 +9302,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9367,10 +9353,7 @@ msgstr ""
#: en/git-branch.txt:170
#, priority:240
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
-msgstr ""
-"�棘克逵鈞逵�� �極龜�棘克, 勻克剋��逵��龜橘 克逵克 棘��剋筠菌龜勻逵筠劇�筠 勻戟筠�戟龜筠 勻筠�克龜, �逵克 龜 "
-"剋棘克逵剋�戟�筠. 鬼棘勻劇筠��戟棘筠 龜�極棘剋�鈞棘勻逵戟龜筠 � `--list` 極棘鈞勻棘剋�筠� 棘��龜剋���棘勻逵�� 龜� 極棘 "
-"�逵閨剋棘戟�(逵劇)."
+msgstr "�棘克逵鈞逵�� �極龜�棘克, 勻克剋��逵��龜橘 克逵克 棘��剋筠菌龜勻逵筠劇�筠 勻戟筠�戟龜筠 勻筠�克龜, �逵克 龜 剋棘克逵剋�戟�筠. 鬼棘勻劇筠��戟棘筠 龜�極棘剋�鈞棘勻逵戟龜筠 � `--list` 極棘鈞勻棘剋�筠� 棘��龜剋���棘勻逵�� 龜� 極棘 �逵閨剋棘戟�(逵劇)."
#. type: Plain text
#: en/git-branch.txt:176
@@ -9607,7 +9590,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9731,7 +9714,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -9776,11 +9759,7 @@ msgstr ""
#: en/git-branch.txt:380
#, priority:240
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
-msgstr ""
-"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."
+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."
#. type: Title =
#: en/git-bundle.txt:2
@@ -10148,7 +10127,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr "<棘閨�筠克�>"
@@ -10184,7 +10163,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10403,7 +10382,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10727,13 +10706,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10823,7 +10802,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10974,127 +10953,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:42
+#, priority:100
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11537,9 +11522,7 @@ msgstr ""
#: en/git-checkout.txt:82
#, fuzzy, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>..."
-msgstr ""
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<��龜剋�>] [<tree-ish>] [--] "
-"<pathspec>..."
+msgstr "'git checkout' [-f|--ours|--theirs|-m|--conflict=<��龜剋�>] [<tree-ish>] [--] <pathspec>..."
#. type: Labeled list
#: en/git-checkout.txt:83
@@ -11572,7 +11555,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11764,7 +11747,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11950,7 +11933,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12686,7 +12669,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12710,7 +12693,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12936,7 +12919,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13511,7 +13494,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13655,7 +13638,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13751,7 +13734,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr "<�筠極棘鈞龜�棘�龜橘>"
@@ -14049,7 +14032,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14109,89 +14092,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14398,7 +14357,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14494,7 +14453,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14797,13 +14756,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14813,13 +14772,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14828,19 +14787,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14850,31 +14809,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14884,55 +14843,110 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, fuzzy, no-wrap, priority:280
+#| msgid "CONFIGURATION"
+msgid "COMMIT INFORMATION"
+msgstr "���圭��叫��揆�赳"
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14953,18 +14967,18 @@ msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 棘極�龜橘
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15145,7 +15159,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15256,8 +15270,7 @@ msgstr "--unset"
#: en/git-config.txt:160
#, priority:100
msgid "Remove the line matching the key from config file."
-msgstr ""
-"叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 ���棘克�, �棘棘�勻筠���勻����� 鈞逵畇逵戟戟棘劇� 克剋���."
+msgstr "叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 ���棘克�, �棘棘�勻筠���勻����� 鈞逵畇逵戟戟棘劇� 克剋���."
#. type: Labeled list
#: en/git-config.txt:161
@@ -15275,9 +15288,7 @@ msgstr "叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 勻�筠
#: en/git-config.txt:167
#, priority:100
msgid "List all variables set in config file, along with their values."
-msgstr ""
-"�筠�筠�龜�剋龜�� 勻�筠 極筠�筠劇筠戟戟�筠 龜 龜� 鈞戟逵�筠戟龜�, ���逵戟棘勻剋筠戟戟�筠 勻 克棘戟�龜均��逵�龜棘戟戟棘劇 "
-"�逵橘剋筠."
+msgstr "�筠�筠�龜�剋龜�� 勻�筠 極筠�筠劇筠戟戟�筠 龜 龜� 鈞戟逵�筠戟龜�, ���逵戟棘勻剋筠戟戟�筠 勻 克棘戟�龜均��逵�龜棘戟戟棘劇 �逵橘剋筠."
#. type: Labeled list
#: en/git-config.txt:168
@@ -15407,214 +15418,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
-msgstr ""
-"��克��勻逵筠� �筠畇逵克�棘� 畇剋� 龜鈞劇筠戟筠戟龜� �克逵鈞逵戟戟棘均棘 �逵橘剋逵 克棘戟�龜均��逵�龜龜; `--system`, "
-"`--global` 龜剋龜 �筠極棘鈞龜�棘�龜� (極棘 �劇棘剋�逵戟龜�)."
+msgstr "��克��勻逵筠� �筠畇逵克�棘� 畇剋� 龜鈞劇筠戟筠戟龜� �克逵鈞逵戟戟棘均棘 �逵橘剋逵 克棘戟�龜均��逵�龜龜; `--system`, `--global` 龜剋龜 �筠極棘鈞龜�棘�龜� (極棘 �劇棘剋�逵戟龜�)."
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr "--default <鈞戟逵�筠戟龜筠>"
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
-msgstr ""
-"��剋龜 �逵橘剋 戟筠 �克逵鈞逵戟 �勻戟棘 � 極棘劇棘��� `--file`, 'git config' 龜�筠� 極逵�逵劇筠��� "
-"克棘戟�龜均��逵�龜龜 勻 �剋筠畇���龜� �筠����� �逵橘剋逵�:"
+msgstr "��剋龜 �逵橘剋 戟筠 �克逵鈞逵戟 �勻戟棘 � 極棘劇棘��� `--file`, 'git config' 龜�筠� 極逵�逵劇筠��� 克棘戟�龜均��逵�龜龜 勻 �剋筠畇���龜� �筠����� �逵橘剋逵�:"
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr "$(prefix)/etc/gitconfig"
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr "鬼龜��筠劇戟�橘 �逵橘剋 克棘戟�龜均��逵�龜龜."
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr "$XDG_CONFIG_HOME/git/config"
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
-msgstr ""
-"��棘�棘橘 極棘剋�鈞棘勻逵�筠剋��克龜橘 �逵橘剋 克棘戟�龜均��逵�龜龜. ��剋龜 極筠�筠劇筠戟戟逵� $XDG_CONFIG_HOME "
-"戟筠 鈞逵畇逵戟逵 龜剋龜 極���逵, 龜�極棘剋�鈞�筠��� `$HOME/.config/git/config`. ��閨逵� "
-"極筠�筠劇筠戟戟逵� �棘 �克逵剋��戟�劇 鈞戟逵�筠戟龜筠劇 (戟筠 �極龜�棘克) 閨�畇筠� 極筠�筠鈞逵極龜�逵戟逵 逵戟逵剋棘均龜�戟棘橘 "
-"極筠�筠劇筠戟戟棘橘, 鈞逵畇逵戟戟棘橘 勻 �逵橘剋筠 `~/.gitconfig`. �筠 �筠克棘劇筠戟畇�筠��� �棘鈞畇逵勻逵�� ��棘� "
-"�逵橘剋, 筠�剋龜 勻� 勻�筠劇� 棘� 勻�筠劇筠戟龜 龜�極棘剋�鈞�筠�筠 閨棘剋筠筠 ��逵��筠 勻筠��龜龜 Git, �逵克 克逵克 "
-"極棘畇畇筠�菌克逵 ��棘均棘 �逵橘剋逵 閨�剋逵 畇棘閨逵勻剋筠戟逵 戟筠 �逵克 畇逵勻戟棘."
+msgstr "��棘�棘橘 極棘剋�鈞棘勻逵�筠剋��克龜橘 �逵橘剋 克棘戟�龜均��逵�龜龜. ��剋龜 極筠�筠劇筠戟戟逵� $XDG_CONFIG_HOME 戟筠 鈞逵畇逵戟逵 龜剋龜 極���逵, 龜�極棘剋�鈞�筠��� `$HOME/.config/git/config`. ��閨逵� 極筠�筠劇筠戟戟逵� �棘 �克逵剋��戟�劇 鈞戟逵�筠戟龜筠劇 (戟筠 �極龜�棘克) 閨�畇筠� 極筠�筠鈞逵極龜�逵戟逵 逵戟逵剋棘均龜�戟棘橘 極筠�筠劇筠戟戟棘橘, 鈞逵畇逵戟戟棘橘 勻 �逵橘剋筠 `~/.gitconfig`. �筠 �筠克棘劇筠戟畇�筠��� �棘鈞畇逵勻逵�� ��棘� �逵橘剋, 筠�剋龜 勻� 勻�筠劇� 棘� 勻�筠劇筠戟龜 龜�極棘剋�鈞�筠�筠 閨棘剋筠筠 ��逵��筠 勻筠��龜龜 Git, �逵克 克逵克 極棘畇畇筠�菌克逵 ��棘均棘 �逵橘剋逵 閨�剋逵 畇棘閨逵勻剋筠戟逵 戟筠 �逵克 畇逵勻戟棘."
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr "~/.gitconfig"
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr "$GIT_DIR/config"
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr "$GIT_DIR/config.worktree"
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15625,7 +15638,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15635,7 +15648,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15645,7 +15658,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15655,7 +15668,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15667,157 +15680,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15827,13 +15840,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15846,19 +15859,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15866,13 +15879,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15959,7 +15972,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -18394,9 +18407,7 @@ msgstr "git-describe(1)"
#: en/git-describe.txt:7
#, priority:260
msgid "git-describe - Give an object a human readable name based on an available ref"
-msgstr ""
-"git-describe - ��龜�勻棘筠戟龜筠 棘閨�筠克�� �畇棘閨棘�龜�逵筠劇棘均棘 龜劇筠戟龜 戟逵 棘�戟棘勻筠 畇棘���極戟棘橘 "
-"���剋克龜"
+msgstr "git-describe - ��龜�勻棘筠戟龜筠 棘閨�筠克�� �畇棘閨棘�龜�逵筠劇棘均棘 龜劇筠戟龜 戟逵 棘�戟棘勻筠 畇棘���極戟棘橘 ���剋克龜"
#. type: Plain text
#: en/git-describe.txt:14
@@ -18713,9 +18724,7 @@ msgstr "git-diff-files - 鬼�逵勻戟龜�� �逵橘剋� 勻 �逵閨棘�筠劇 克逵�逵
#: en/git-diff-files.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
-msgstr ""
-"'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] "
-"[<極���>...]\n"
+msgstr "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<極���>...]\n"
#. type: Plain text
#: en/git-diff-files.txt:20
@@ -19306,7 +19315,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19429,9 +19438,7 @@ msgstr "git-diff(1)"
#: en/git-diff.txt:7
#, priority:280
msgid "git-diff - Show changes between commits, commit and working tree, etc"
-msgstr ""
-"git-diff - ��勻棘畇 �逵鈞戟龜�� 劇筠菌畇� 克棘劇劇龜�逵劇龜, 克棘劇劇龜�棘劇 龜 �逵閨棘�龜劇 克逵�逵剋棘均棘劇 龜 �逵克 "
-"畇逵剋筠筠"
+msgstr "git-diff - ��勻棘畇 �逵鈞戟龜�� 劇筠菌畇� 克棘劇劇龜�逵劇龜, 克棘劇劇龜�棘劇 龜 �逵閨棘�龜劇 克逵�逵剋棘均棘劇 龜 �逵克 畇逵剋筠筠"
#. type: Plain text
#: en/git-diff.txt:17
@@ -22579,7 +22586,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22968,7 +22975,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23734,7 +23741,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24353,7 +24360,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -25835,8 +25842,7 @@ msgstr "git-fsck-objects(1)"
#: en/git-fsck-objects.txt:7
#, priority:100
msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
-msgstr ""
-"git-fsck-objects - ��棘勻筠�克逵 �勻�鈞戟棘��龜 龜 勻逵剋龜畇戟棘��龜 棘閨�筠克�棘勻 勻 閨逵鈞筠 畇逵戟戟��"
+msgstr "git-fsck-objects - ��棘勻筠�克逵 �勻�鈞戟棘��龜 龜 勻逵剋龜畇戟棘��龜 棘閨�筠克�棘勻 勻 閨逵鈞筠 畇逵戟戟��"
#. type: Plain text
#: en/git-fsck-objects.txt:13
@@ -25848,9 +25854,7 @@ msgstr "'git fsck-objects' ...\n"
#: en/git-fsck-objects.txt:19
#, priority:100
msgid "This is a synonym for linkgit:git-fsck[1]. Please refer to the documentation of that command."
-msgstr ""
-"葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-fsck[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� "
-"棘戟棘橘."
+msgstr "葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-fsck[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� 棘戟棘橘."
#. type: Title =
#: en/git-fsck.txt:2
@@ -26121,7 +26125,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26491,7 +26495,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26567,575 +26571,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, fuzzy, priority:100
msgid "Don't match the pattern in binary files."
msgstr "戟筠 龜�克逵�� �棘勻極逵畇筠戟龜� �逵閨剋棘戟逵 勻 畇勻棘龜�戟�� �逵橘剋逵�"
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, fuzzy, priority:100
msgid "Print an empty line between matches from different files."
msgstr "勻�勻棘畇龜�� 極����� ���棘克� 極棘�剋筠 �棘勻極逵畇筠戟龜橘 龜鈞 �逵鈞戟�� �逵橘剋棘勻"
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, fuzzy, no-wrap, priority:100
msgid "-C <num>"
msgstr "-C[<�龜�剋棘>]"
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27173,7 +27195,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -28853,17 +28875,13 @@ msgstr "git-init-db - 鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git
#: en/git-init-db.txt:13
#, no-wrap, priority:100
msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
-msgstr ""
-"'git init-db' [-q | --quiet] [--bare] [--template=<克逵�逵剋棘均_�逵閨剋棘戟棘勻>] "
-"[--separate-git-dir <克逵�逵剋棘均_git>] [--shared[=<極�逵勻逵_畇棘���極逵>]]\n"
+msgstr "'git init-db' [-q | --quiet] [--bare] [--template=<克逵�逵剋棘均_�逵閨剋棘戟棘勻>] [--separate-git-dir <克逵�逵剋棘均_git>] [--shared[=<極�逵勻逵_畇棘���極逵>]]\n"
#. type: Plain text
#: en/git-init-db.txt:20
#, priority:100
msgid "This is a synonym for linkgit:git-init[1]. Please refer to the documentation of that command."
-msgstr ""
-"葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-init[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� "
-"棘戟棘橘."
+msgstr "葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-init[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� 棘戟棘橘."
#. type: Title =
#: en/git-init.txt:2
@@ -28875,9 +28893,7 @@ msgstr "git-init(1)"
#: en/git-init.txt:7
#, priority:300
msgid "git-init - Create an empty Git repository or reinitialize an existing one"
-msgstr ""
-"git-init - 鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜剋龜 極筠�筠龜戟龜�龜逵剋龜鈞逵�龜� "
-"���筠��勻���筠均棘"
+msgstr "git-init - 鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜剋龜 極筠�筠龜戟龜�龜逵剋龜鈞逵�龜� ���筠��勻���筠均棘"
#. type: Plain text
#: en/git-init.txt:15
@@ -30696,7 +30712,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, fuzzy, no-wrap, priority:100
msgid "other"
msgstr "���均棘筠"
@@ -30762,7 +30778,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30890,97 +30906,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -31001,7 +31017,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31509,7 +31525,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -32016,9 +32032,7 @@ msgstr "git-merge-one-file(1)"
#: en/git-merge-one-file.txt:7
#, priority:100
msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
-msgstr ""
-"git-merge-one-file - 鬼�逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克 畇剋� 龜�極棘剋�鈞棘勻逵戟龜� "
-"�棘勻劇筠��戟棘 � git-merge-index"
+msgstr "git-merge-one-file - 鬼�逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克 畇剋� 龜�極棘剋�鈞棘勻逵戟龜� �棘勻劇筠��戟棘 � git-merge-index"
#. type: Plain text
#: en/git-merge-one-file.txt:13
@@ -32030,10 +32044,7 @@ msgstr "'git merge-one-file'\n"
#: en/git-merge-one-file.txt:18
#, priority:100
msgid "This is the standard helper program to use with 'git merge-index' to resolve a merge after the trivial merge done with 'git read-tree -m'."
-msgstr ""
-"葵�棘 ��逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克, 龜�極棘剋�鈞�筠劇逵� �棘勻劇筠��戟棘 � 'git-merge-"
-"index', ��棘閨� 鈞逵勻筠��龜�� �剋龜�戟龜筠 極棘�剋筠 �棘均棘 克逵克 ��龜勻龜逵剋�戟逵� �逵��� �剋龜�戟龜� �菌筠 "
-"勻�極棘剋戟筠戟逵 'git read-tree -m'."
+msgstr "葵�棘 ��逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克, 龜�極棘剋�鈞�筠劇逵� �棘勻劇筠��戟棘 � 'git-merge-index', ��棘閨� 鈞逵勻筠��龜�� �剋龜�戟龜筠 極棘�剋筠 �棘均棘 克逵克 ��龜勻龜逵剋�戟逵� �逵��� �剋龜�戟龜� �菌筠 勻�極棘剋戟筠戟逵 'git read-tree -m'."
#. type: Title =
#: en/git-mergetool--lib.txt:2
@@ -32195,8 +32206,7 @@ msgstr ""
#: en/git-mergetool.txt:69
#, priority:240
msgid "Print a list of merge tools that may be used with `--tool`."
-msgstr ""
-"��勻筠��龜 �極龜�棘克 ��龜剋龜�, 克棘�棘��筠 劇棘菌戟棘 龜�極棘剋�鈞棘勻逵�� � 極逵�逵劇筠��棘劇 `--tool`."
+msgstr "��勻筠��龜 �極龜�棘克 ��龜剋龜�, 克棘�棘��筠 劇棘菌戟棘 龜�極棘剋�鈞棘勻逵�� � 極逵�逵劇筠��棘劇 `--tool`."
#. type: Plain text
#: en/git-mergetool.txt:77
@@ -32420,9 +32430,7 @@ msgstr ""
#: en/git-merge.txt:110
#, priority:240
msgid "Forget about the current merge in progress. Leave the index and the working tree as-is."
-msgstr ""
-"�逵閨��� 棘 �筠克��筠劇 極�棘�筠��筠 �剋龜�戟龜�. ���逵勻龜�� 龜戟畇筠克� 龜 �逵閨棘�龜橘 克逵�逵剋棘均 勻 "
-"�筠克��筠劇 �棘��棘�戟龜龜."
+msgstr "�逵閨��� 棘 �筠克��筠劇 極�棘�筠��筠 �剋龜�戟龜�. ���逵勻龜�� 龜戟畇筠克� 龜 �逵閨棘�龜橘 克逵�逵剋棘均 勻 �筠克��筠劇 �棘��棘�戟龜龜."
#. type: Plain text
#: en/git-merge.txt:115
@@ -32863,9 +32871,7 @@ msgstr ""
#: en/git-mktree.txt:25
#, priority:100
msgid "Read the NUL-terminated `ls-tree -z` output instead."
-msgstr ""
-"槻龜�逵�� 鈞逵極龜�龜 �逵鈞畇筠剋�戟戟�筠 �叫���竅�� �龜劇勻棘剋逵劇龜 (克逵克 勻 勻�勻棘畇筠 `ls-tree -z`), "
-"勻劇筠��棘 克棘戟�棘勻 ���棘克."
+msgstr "槻龜�逵�� 鈞逵極龜�龜 �逵鈞畇筠剋�戟戟�筠 �叫���竅�� �龜劇勻棘剋逵劇龜 (克逵克 勻 勻�勻棘畇筠 `ls-tree -z`), 勻劇筠��棘 克棘戟�棘勻 ���棘克."
#. type: Labeled list
#: en/git-mktree.txt:26
@@ -32895,9 +32901,7 @@ msgstr "git-mv(1)"
#: en/git-mv.txt:7
#, priority:280
msgid "git-mv - Move or rename a file, a directory, or a symlink"
-msgstr ""
-"git-mv - �筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋龜�筠�克棘橘 "
-"���剋克龜"
+msgstr "git-mv - �筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋龜�筠�克棘橘 ���剋克龜"
#. type: Plain text
#: en/git-mv.txt:13
@@ -32909,9 +32913,7 @@ msgstr ""
#: en/git-mv.txt:17
#, priority:280
msgid "Move or rename a file, directory or symlink."
-msgstr ""
-"�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋龜�筠�克棘橘 "
-"���剋克龜."
+msgstr "�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋龜�筠�克棘橘 ���剋克龜."
#. type: Plain text
#: en/git-mv.txt:20
@@ -33394,7 +33396,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -35814,9 +35816,7 @@ msgstr "git-parse-remote(1)"
#: en/git-parse-remote.txt:7
#, priority:100
msgid "git-parse-remote - Routines to help parsing remote repository access parameters"
-msgstr ""
-"git-parse-remote - �棘畇極�棘均�逵劇劇� 畇剋� 極棘劇棘�龜 �逵鈞閨棘�逵 極逵�逵劇筠��棘勻 畇棘���極逵 "
-"勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜�"
+msgstr "git-parse-remote - �棘畇極�棘均�逵劇劇� 畇剋� 極棘劇棘�龜 �逵鈞閨棘�逵 極逵�逵劇筠��棘勻 畇棘���極逵 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜�"
#. type: Plain text
#: en/git-parse-remote.txt:13
@@ -35828,11 +35828,7 @@ msgstr "'. \"$(git --exec-path)/git-parse-remote\"'\n"
#: en/git-parse-remote.txt:20
#, priority:100
msgid "This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing."
-msgstr ""
-"葵�棘� ��筠戟逵�龜橘 畇棘閨逵勻剋筠戟 勻 克棘剋剋筠克�龜� ��筠戟逵�龜筠勻, 畇逵閨� 極�筠畇棘��逵勻龜�� 極棘畇極�棘均�逵劇劇� "
-"畇剋� �逵鈞閨棘�逵 �逵橘剋棘勻, ��逵戟��龜��� 勻 克逵�逵剋棘均逵� $GIT_DIR/remotes/ 龜 $GIT_DIR/"
-"branches/, 逵 �逵克菌筠 戟筠克棘�棘��� 戟逵���棘筠�戟�� 極筠�筠劇筠戟戟�� �勻�鈞逵戟戟�� � 龜鈞勻剋筠�筠戟龜筠劇 "
-"(fetch), 極棘剋��筠戟龜筠劇 (pull) 龜 棘�極�逵勻克棘橘 (push) 龜鈞劇筠戟筠戟龜橘."
+msgstr "葵�棘� ��筠戟逵�龜橘 畇棘閨逵勻剋筠戟 勻 克棘剋剋筠克�龜� ��筠戟逵�龜筠勻, 畇逵閨� 極�筠畇棘��逵勻龜�� 極棘畇極�棘均�逵劇劇� 畇剋� �逵鈞閨棘�逵 �逵橘剋棘勻, ��逵戟��龜��� 勻 克逵�逵剋棘均逵� $GIT_DIR/remotes/ 龜 $GIT_DIR/branches/, 逵 �逵克菌筠 戟筠克棘�棘��� 戟逵���棘筠�戟�� 極筠�筠劇筠戟戟�� �勻�鈞逵戟戟�� � 龜鈞勻剋筠�筠戟龜筠劇 (fetch), 極棘剋��筠戟龜筠劇 (pull) 龜 棘�極�逵勻克棘橘 (push) 龜鈞劇筠戟筠戟龜橘."
#. type: Title =
#: en/git-patch-id.txt:2
@@ -36102,9 +36098,7 @@ msgstr "git-pull(1)"
#: en/git-pull.txt:7
#, priority:220
msgid "git-pull - Fetch from and integrate with another repository or a local branch"
-msgstr ""
-"git-pull - �棘剋��筠戟龜筠 龜 �剋龜�戟龜筠 龜鈞劇筠戟筠戟龜橘 龜鈞 畇��均棘均棘 �筠極棘鈞龜�棘�龜� 龜剋龜 "
-"剋棘克逵剋�戟棘橘 勻筠�克龜"
+msgstr "git-pull - �棘剋��筠戟龜筠 龜 �剋龜�戟龜筠 龜鈞劇筠戟筠戟龜橘 龜鈞 畇��均棘均棘 �筠極棘鈞龜�棘�龜� 龜剋龜 剋棘克逵剋�戟棘橘 勻筠�克龜"
#. type: Plain text
#: en/git-pull.txt:13
@@ -36291,13 +36285,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38439,7 +38433,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38469,487 +38463,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38957,27 +39018,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38985,154 +39048,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
+#, no-wrap, priority:100
+msgid ""
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39141,73 +39389,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39218,25 +39466,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39249,31 +39497,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39287,85 +39535,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39376,13 +39624,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39393,13 +39641,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39410,73 +39658,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39487,19 +39735,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39509,67 +39757,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39583,25 +39831,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39612,7 +39860,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39622,7 +39870,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39631,55 +39879,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39690,13 +39938,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39704,7 +39952,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39716,7 +39964,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39725,37 +39973,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42327,7 +42575,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -44060,223 +44308,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr "git-rm - 叫畇逵剋筠戟龜筠 �逵橘剋棘勻 龜鈞 �逵閨棘�筠均棘 克逵�逵剋棘均逵 龜 龜戟畇筠克�逵"
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr "��棘極���龜�� 極�棘勻筠�克� 逵克��逵剋�戟棘��龜."
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr "�逵勻�筠�龜�� �逵閨棘�� � 戟�剋筠勻�劇 克棘畇棘劇 勻棘鈞勻�逵�逵, 畇逵菌筠 筠�剋龜 �逵橘剋� 戟筠 戟逵橘畇筠戟�."
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr "git ls-files -z | xargs -0 rm -f\n"
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr "git add -A\n"
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr "鬼劇棘��龜 linkgit:git-add[1]."
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr "`git rm Documentation/\\*.txt`"
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr "`git rm -f git-*.sh`"
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46794,9 +47039,7 @@ msgstr "'git stage' 逵�均�劇筠戟��...\n"
#: en/git-stage.txt:20
#, priority:100
msgid "This is a synonym for linkgit:git-add[1]. Please refer to the documentation of that command."
-msgstr ""
-"葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-add[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� "
-"棘戟棘橘."
+msgstr "葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-add[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� 棘戟棘橘."
#. type: Title =
#: en/git-stash.txt:2
@@ -46811,7 +47054,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr "git-stash - 鬼極���逵�� 龜鈞劇筠戟筠戟龜� 勻 龜鈞劇筠戟�戟戟棘劇 �逵閨棘�筠劇 克逵�逵剋棘均筠"
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46821,6 +47064,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46828,97 +47072,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46926,139 +47140,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr "show [<棘極�龜龜>] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "apply [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]"
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, fuzzy, no-wrap, priority:240
msgid "store"
msgstr "劇龜戟-畇剋龜戟逵"
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -47067,31 +47377,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -47103,13 +47413,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47124,13 +47434,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47142,19 +47452,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47169,19 +47479,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47190,7 +47500,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48170,7 +48480,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48348,7 +48658,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48625,19 +48935,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -50992,9 +51308,7 @@ msgstr "git-tag(1)"
#: en/git-tag.txt:7
#, priority:240
msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
-msgstr ""
-"git-tag - 鬼棘鈞畇逵戟龜筠, 棘�棘閨�逵菌筠戟龜筠, �畇逵剋筠戟龜筠 龜剋龜 勻筠�龜�龜克逵�龜� 劇筠�克龜, 極棘畇極龜�逵戟戟棘橘 "
-"� 極棘劇棘��� GPG"
+msgstr "git-tag - 鬼棘鈞畇逵戟龜筠, 棘�棘閨�逵菌筠戟龜筠, �畇逵剋筠戟龜筠 龜剋龜 勻筠�龜�龜克逵�龜� 劇筠�克龜, 極棘畇極龜�逵戟戟棘橘 � 極棘劇棘��� GPG"
#. type: Plain text
#: en/git-tag.txt:20
@@ -51263,7 +51577,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr "<克棘劇劇龜�>"
@@ -51708,311 +52022,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, fuzzy, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr "��戟棘勻戟�筠 劇逵�龜戟棘�龜�逵筠劇�筠 克棘劇逵戟畇�"
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr "�鈞逵龜劇棘畇筠橘��勻龜筠 � 畇��均龜劇龜"
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -52021,7 +52347,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -52031,613 +52357,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
-#, fuzzy, priority:100
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "linkgit:git-commit-tree[1]"
+#: en/git.txt:529
+#, priority:100
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52652,530 +53014,526 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
-msgstr ""
-"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
-"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-"
-"tutorial[7], linkgit:gitcli[7], link:user-manual.html[�棘剋�鈞棘勻逵�筠剋��克棘筠 "
-"��克棘勻棘畇��勻棘 Git], linkgit:gitworkflows[7]"
+msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[�棘剋�鈞棘勻逵�筠剋��克棘筠 ��克棘勻棘畇��勻棘 Git], linkgit:gitworkflows[7]"
#. type: Title =
#: en/git-unpack-file.txt:2
@@ -54152,7 +54510,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -55802,10 +56172,7 @@ msgstr "*\n"
#: en/gitglossary.txt:24
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
-msgstr ""
-"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7]"
-", linkgit:giteveryday[7], link:user-manual.html[�棘剋�鈞棘勻逵�筠剋��克棘筠 ��克棘勻棘畇��勻棘 "
-"Git]"
+msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[�棘剋�鈞棘勻逵�筠剋��克棘筠 ��克棘勻棘畇��勻棘 Git]"
#. type: Labeled list
#: en/glossary-content.txt:1
@@ -58495,7 +58862,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
@@ -58923,185 +59290,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -59111,7 +59490,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -59121,13 +59500,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -62112,6 +62491,10 @@ msgstr ""
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+#, fuzzy
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "linkgit:git-commit-tree[1]"
+
#, ignore-same
#~ msgid "git-remote-testgit(1)"
#~ msgstr "git-remote-testgit(1)"
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index ca33bba..c47fe10 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-01-18 19:51+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -78,7 +78,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -126,7 +126,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -276,7 +276,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -708,7 +708,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1655,8 +1655,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2451,61 +2451,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3539,7 +3539,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3551,13 +3551,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4018,7 +4018,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4050,7 +4050,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4086,7 +4086,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4106,7 +4106,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4718,15 +4718,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4856,13 +4856,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4898,7 +4898,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4940,13 +4940,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4958,7 +4958,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4970,7 +4970,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5006,13 +5006,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5102,7 +5102,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5234,7 +5234,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5246,13 +5246,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5284,7 +5284,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5356,7 +5356,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5374,7 +5374,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5398,253 +5398,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--server-option=<se챌enek>"
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5685,7 +5685,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5727,13 +5727,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5745,7 +5745,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5763,13 +5763,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5793,13 +5793,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5973,43 +5973,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6051,7 +6051,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6363,7 +6363,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6375,13 +6375,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6409,7 +6409,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6431,7 +6431,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6473,7 +6473,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6503,7 +6503,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6595,37 +6595,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6685,7 +6685,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6697,7 +6697,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6709,7 +6709,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6721,19 +6721,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6745,7 +6745,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6799,115 +6799,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -6993,7 +6994,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7023,8 +7024,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7035,7 +7036,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7107,7 +7108,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7130,8 +7131,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7323,7 +7324,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7353,7 +7354,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7493,7 +7494,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7683,7 +7684,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9245,7 +9246,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9269,7 +9270,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9557,7 +9558,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9681,7 +9682,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10094,7 +10095,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10130,7 +10131,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10349,7 +10350,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10673,13 +10674,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10769,7 +10770,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10920,127 +10921,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11516,7 +11523,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11708,7 +11715,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11894,7 +11901,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12630,7 +12637,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12654,7 +12661,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12880,7 +12887,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13446,7 +13453,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13590,7 +13597,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13686,7 +13693,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13984,7 +13991,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14044,89 +14051,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14333,7 +14316,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14429,7 +14412,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14732,13 +14715,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14748,13 +14731,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14763,19 +14746,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14785,31 +14768,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14819,55 +14802,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14888,18 +14925,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15080,7 +15117,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15339,204 +15376,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15547,7 +15596,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15557,7 +15606,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15567,7 +15616,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15577,7 +15626,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15589,157 +15638,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15749,13 +15798,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15768,19 +15817,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15788,13 +15837,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15881,7 +15930,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19214,7 +19263,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22485,7 +22534,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22874,7 +22923,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23633,7 +23682,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24252,7 +24301,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26015,7 +26064,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26385,7 +26434,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26461,575 +26510,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27067,7 +27134,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30581,7 +30648,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30647,7 +30714,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30772,97 +30839,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30883,7 +30950,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31391,7 +31458,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33262,7 +33329,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36143,13 +36210,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38287,7 +38354,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38317,487 +38384,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38805,27 +38939,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38833,154 +38969,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -38989,73 +39310,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39066,25 +39387,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39097,31 +39418,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39135,85 +39456,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39224,13 +39545,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39241,13 +39562,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39258,73 +39579,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39335,19 +39656,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39357,67 +39678,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39431,25 +39752,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39460,7 +39781,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39470,7 +39791,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39479,55 +39800,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39538,13 +39859,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39552,7 +39873,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39564,7 +39885,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39573,37 +39894,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42175,7 +42496,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43907,223 +44228,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46652,7 +46970,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46662,6 +46980,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46669,97 +46988,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46767,139 +47056,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46908,31 +47293,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46944,13 +47329,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46965,13 +47350,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46983,19 +47368,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47010,19 +47395,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47031,7 +47416,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48011,7 +48396,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48189,7 +48574,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48466,19 +48851,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51101,7 +51492,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -51539,311 +51930,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51852,7 +52255,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51862,613 +52265,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52483,523 +52922,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53979,7 +54418,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58312,7 +58763,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58740,185 +59191,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58928,7 +59391,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58938,13 +59401,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 38aa655..956f43c 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-04-01 07:08+0000\n"
"Last-Translator: �� <ranto2012@163.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -78,7 +78,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -126,7 +126,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -276,7 +276,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -708,7 +708,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr "Subersion Git "
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1337,8 +1337,8 @@ msgstr ""
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
-# �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
#. type: Plain text
+# �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
#: en/cmds-plumbinginterrogators.txt:36
#, priority:100
msgid "Find symbolic names for given revs."
@@ -1656,8 +1656,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2452,61 +2452,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3540,7 +3540,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3552,13 +3552,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4019,7 +4019,7 @@ msgid "Synonym for `-p --stat`."
msgstr " '-p --stat' "
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4051,7 +4051,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4087,7 +4087,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4107,7 +4107,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4719,15 +4719,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4857,13 +4857,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4899,7 +4899,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4941,13 +4941,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4959,7 +4959,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4971,7 +4971,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5007,13 +5007,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5103,7 +5103,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5235,7 +5235,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5247,13 +5247,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5285,7 +5285,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5357,7 +5357,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5375,7 +5375,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5399,253 +5399,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <upload-pack>"
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "�쀤퐰與▼폀��"
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--server-option=<option>"
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr "鵝욜뵪�뤺��덃쑍2瓦쏂죱�싦에�띰펽弱녺퍢若싩쉪耶쀧Е訝꿜폖渦볟댆�띶뒦�ⓦ�귞퍢若싩쉪耶쀧Е訝꿜툖孃쀥똿�첥UL�뻃F耶쀧Е�귝쐨�▼솳野방쐨�▼솳�됮」竊덂똿�ф쑋�ι�됮」竊됬쉪鸚꾤릤��룚�념틢�띶뒦�ⓦ�귛퐪瀯쇿눣鸚싦릉`--server-option = <option>`�띰펽若껂뺄�썸뙃�㎩뫝餓ㅸ죱訝�닓�븀쉪窈뷴틣�묌�곩댆�╊�塋���"
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5684,16 +5684,14 @@ msgid ""
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
-"-i] [--patch | -p]\n"
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
-"[--renormalize]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "�뤺염"
@@ -5735,13 +5733,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "瑥룟뢿�� linkgit:git-commit[1] 雅녻㎗弱녶냵若방렌�졾댆�먧벡�꾢끀餓뽪쎘餓ｆ뼶力뺛��"
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "�됮」"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<pathspec>..."
@@ -5750,14 +5748,10 @@ msgstr "<pathspec>..."
#: en/git-add.txt:65
#, priority:300
msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all matching files. Also a leading directory name (e.g. `dir` to add `dir/file1` and `dir/file2`) can be given to update the index to match the current state of the directory as a whole (e.g. specifying `dir` will record not just a file `dir/file1` modified in the working tree, a file `dir/file2` added to the working tree, but also a file `dir/file3` removed from the working tree). Note that older versions of Git used to ignore removed files; use `--no-all` option if you want to add modified or new files but ignore removed ones."
-msgstr ""
-"誤곦퍗訝�렌�졾냵若밭쉪�뉏뻑�괚ileglobs竊덁풃倻�`*.c`竊됧룾餓η뵪�ζ렌�졿��됧뙶�띸쉪�뉏뻑�귝�鸚뽳펽瓦섇룾餓ζ룓堊쎽�訝ゅ뎺野쇘쎅壤뺝릫竊덁풃倻귨펽�뉐츣`dir`餓ζ렌��`dir/"
-"file1`��`dir/file2`竊됪씎�닸뼭榮℡폊竊뚥슴�뜸툗�답릉��퐬�꾢퐪�띸듁�곭쎑�백뀓竊덁풃倻귨펽�뉐츣`dir`訝띴퍎鴉싪�壤뺝쑉藥δ퐳�묇릎岳�뵻�꾣뻼餓�`dir/"
-"file1`竊뚩퓲鴉싪�壤뺝쑉藥δ퐳�묇릎曆삣뒥�꾣뻼餓�`dir/file2`竊뚩퓲�됦퍗藥δ퐳�묇릎�좈솮�꾣뻼餓�`dir/"
-"file3`竊됥�귟�力ⓩ꼷竊뚧뿧�덃쑍�껯it鴉싧옙�ε럴�좈솮�꾣뻼餓띰폑倻귝옖誤곫렌�졾럴岳�뵻�꾣뻼餓뜻닑�경뻼餓띰펽鵝녶옙�ε럴�좈솮�꾣뻼餓띰펽瑥룝슴�ⓥ��--no all�앶�됮」��"
+msgstr "誤곦퍗訝�렌�졾냵若밭쉪�뉏뻑�괚ileglobs竊덁풃倻�`*.c`竊됧룾餓η뵪�ζ렌�졿��됧뙶�띸쉪�뉏뻑�귝�鸚뽳펽瓦섇룾餓ζ룓堊쎽�訝ゅ뎺野쇘쎅壤뺝릫竊덁풃倻귨펽�뉐츣`dir`餓ζ렌��`dir/file1`��`dir/file2`竊됪씎�닸뼭榮℡폊竊뚥슴�뜸툗�답릉��퐬�꾢퐪�띸듁�곭쎑�백뀓竊덁풃倻귨펽�뉐츣`dir`訝띴퍎鴉싪�壤뺝쑉藥δ퐳�묇릎岳�뵻�꾣뻼餓�`dir/file1`竊뚩퓲鴉싪�壤뺝쑉藥δ퐳�묇릎曆삣뒥�꾣뻼餓�`dir/file2`竊뚩퓲�됦퍗藥δ퐳�묇릎�좈솮�꾣뻼餓�`dir/file3`竊됥�귟�力ⓩ꼷竊뚧뿧�덃쑍�껯it鴉싧옙�ε럴�좈솮�꾣뻼餓띰폑倻귝옖誤곫렌�졾럴岳�뵻�꾣뻼餓뜻닑�경뻼餓띰펽鵝녶옙�ε럴�좈솮�꾣뻼餓띰펽瑥룝슴�ⓥ��--no all�앶�됮」��"
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "�됧뀽 <pathspec> �쇔폀�꾣쎍鸚싩퍏�귨펽瑥룟뢿�� linkgit:gitglossary[7]��"
@@ -5775,13 +5769,13 @@ msgid "Allow adding otherwise ignored files."
msgstr "�곮�曆삣뒥藥꿱˙恙썹븼�꾣뻼餓뜰��"
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5802,17 +5796,16 @@ msgstr "雅ㅴ틨�겼쑉榮℡폊�뚦램鵝쒏젒阿뗩뿴�됪떓烏δ툈�쀥뭉弱녶츆餓ф렌�졾댆
#: en/git-add.txt:99
#, priority:300
msgid "This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' for details."
-msgstr ""
-"瓦쇿룾餓ζ쐣�덂쑑瓦먫죱`add --interactive`竊뚥퐜��폏瀯뺠퓝�앭쭓�썰빱�쒎뜒竊뚩�뚨쎍�θ럼饔у댆�� patch�앭춴�썰빱�귝쐣�녘�瀯녵에��펽瑥룟뢿鰲�``雅ㅴ틨與▼폀''��"
+msgstr "瓦쇿룾餓ζ쐣�덂쑑瓦먫죱`add --interactive`竊뚥퐜��폏瀯뺠퓝�앭쭓�썰빱�쒎뜒竊뚩�뚨쎍�θ럼饔у댆�� patch�앭춴�썰빱�귝쐣�녘�瀯녵에��펽瑥룟뢿鰲�``雅ㅴ틨與▼폀''��"
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5827,9 +5820,7 @@ msgstr "�①폋渦묈솳訝�돀凉�訝롧뇨凉뺟쉪藥�펰竊뚥슴�ⓩ댎瓦쏂죱煐뽬풌�귛뀽��
#: en/git-add.txt:111
#, priority:300
msgid "The intent of this option is to pick and choose lines of the patch to apply, or even to modify the contents of lines to be staged. This can be quicker and more flexible than using the interactive hunk selector. However, it is easy to confuse oneself and create a patch that does not apply to the index. See EDITING PATCHES below."
-msgstr ""
-"閭ㅹ�됮」�꾤쎅�꾣삸�됪떓亮띌�됪떓誤곩틪�①쉪烏δ툈�꾥죱竊뚨뵚�념엶�배쫨�귛춼�꾥죱�꾢냵若밤�귚툗鵝욜뵪雅ㅴ틨凉뤺‥訝곩쓼�됪떓�①쎑驪뷂펽�뜻쎍恙ワ펽�당겣域삠�귚퐜��펽孃덂��볠렁曆녻눎藥긷뭉�쎾뻠訝띶틪�ⓧ틢榮℡폊��"
-"烏δ툈�귟��귡쁾訝뗩씊�꾤폋渦묋‥訝곥��"
+msgstr "閭ㅹ�됮」�꾤쎅�꾣삸�됪떓亮띌�됪떓誤곩틪�①쉪烏δ툈�꾥죱竊뚨뵚�념엶�배쫨�귛춼�꾥죱�꾢냵若밤�귚툗鵝욜뵪雅ㅴ틨凉뤺‥訝곩쓼�됪떓�①쎑驪뷂펽�뜻쎍恙ワ펽�당겣域삠�귚퐜��펽孃덂��볠렁曆녻눎藥긷뭉�쎾뻠訝띶틪�ⓧ틢榮℡폊�꾥‥訝곥�귟��귡쁾訝뗩씊�꾤폋渦묋‥訝곥��"
#. type: Labeled list
#: en/git-add.txt:113
@@ -5865,8 +5856,7 @@ msgstr "--no-ignore-removal"
#: en/git-add.txt:130
#, priority:300
msgid "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree."
-msgstr ""
-"訝띴퍎�ⓨ램鵝쒏젒訝�쐣訝�<pathspec>�백뀓�꾣뻼餓띄쉪�경뼶�닸뼭榮℡폊竊뚩�뚥툝�①뇨凉뺜릎藥꿰퍘�됦�訝ら」�꾢쑑�방쎍�곁뇨凉뺛�귟퓳弱녷렌�졼�곦엶�밧뭽�좈솮訝롥램鵝쒏젒�백뀓�꾤뇨凉뺡」��"
+msgstr "訝띴퍎�ⓨ램鵝쒏젒訝�쐣訝�<pathspec>�백뀓�꾣뻼餓띄쉪�경뼶�닸뼭榮℡폊竊뚩�뚥툝�①뇨凉뺜릎藥꿰퍘�됦�訝ら」�꾢쑑�방쎍�곁뇨凉뺛�귟퓳弱녷렌�졼�곦엶�밧뭽�좈솮訝롥램鵝쒏젒�백뀓�꾤뇨凉뺡」��"
#. type: Plain text
#: en/git-add.txt:135
@@ -5896,9 +5886,7 @@ msgstr "�싪퓝曆삣뒥榮℡폊�ょ윥�꾣뼭�뉏뻑�뚦쑉藥δ퐳�묇릎岳�뵻�꾣뻼餓뜸빳
#: en/git-add.txt:146
#, ignore-ellipsis, priority:300
msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files."
-msgstr ""
-"閭ㅹ�됮」訝삭쫨�ⓧ틢躍�뒰�ｄ틳阿졿꺈雅롨푵�㎫뎵�촅it�꾤뵪�룔�귝뿧�덃쑍訝�쉪\"Git add<pathspec>...\"��\"Git add--no "
-"all<pathspec>...\"�꾢릪阿됭칾竊뚦뜵恙썹븼藥꿨닠�ㅷ쉪�뉏뻑��"
+msgstr "閭ㅹ�됮」訝삭쫨�ⓧ틢躍�뒰�ｄ틳阿졿꺈雅롨푵�㎫뎵�촅it�꾤뵪�룔�귝뿧�덃쑍訝�쉪\"Git add<pathspec>...\"��\"Git add--no all<pathspec>...\"�꾢릪阿됭칾竊뚦뜵恙썹븼藥꿨닠�ㅷ쉪�뉏뻑��"
#. type: Labeled list
#: en/git-add.txt:147 en/git-format-patch.txt:103 en/git-submodule.txt:351
@@ -5916,9 +5904,7 @@ msgstr "--intent-to-add"
#: en/git-add.txt:154
#, fuzzy, priority:300
msgid "Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with `git diff` and committing them with `git commit -a`."
-msgstr ""
-"�よ�壤뺟쮰�롥컛曆삣뒥瓮�푶�꾡틟若욁�귟러孃꾤쉪窈밥폏熬ユ붂營�쑉榮℡폊訝�펽鵝녵툖�끾떖�밧뒯�꾢냵若밤�귟퓳野밥틢鵝욜뵪`git diff`�양ㅊ�뉏뻑�꾣쑋�귛춼�끻�餓ε룋鵝�`git commit "
-"-a`�먧벡瓦쇾틳�뉏뻑�욃만�됬뵪��"
+msgstr "�よ�壤뺟쮰�롥컛曆삣뒥瓮�푶�꾡틟若욁�귟러孃꾤쉪窈밥폏熬ユ붂營�쑉榮℡폊訝�펽鵝녵툖�끾떖�밧뒯�꾢냵若밤�귟퓳野밥틢鵝욜뵪`git diff`�양ㅊ�뉏뻑�꾣쑋�귛춼�끻�餓ε룋鵝�`git commit -a`�먧벡瓦쇾틳�뉏뻑�욃만�됬뵪��"
#. type: Labeled list
#: en/git-add.txt:155 en/git-update-index.txt:55
@@ -5942,9 +5928,7 @@ msgstr "--ignore-errors"
#: en/git-add.txt:165
#, priority:300
msgid "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable `add.ignoreErrors` can be set to true to make this the default behaviour."
-msgstr ""
-"倻귝옖�긴틢榮℡폊�숃��뚧뿞力뺞렌�졿윇雅쎿뻼餓띰펽瑥룝툖誤곦릎閭€뱧鵝쒙펽�뚧삸瀯㎫뺌曆삣뒥�뜸퍟�뉏뻑�귛뫝餓ㅴ퍖佯붶빳�욇쎏�뜻�곲���뷩�귛룾餓ε컛�띸쉰�섌뇧`add.ignoreErrors`溫양쉰訝�"
-"true竊뚥슴�뜻닇訝븅퍡溫ㅸ죱訝뷩��"
+msgstr "倻귝옖�긴틢榮℡폊�숃��뚧뿞力뺞렌�졿윇雅쎿뻼餓띰펽瑥룝툖誤곦릎閭€뱧鵝쒙펽�뚧삸瀯㎫뺌曆삣뒥�뜸퍟�뉏뻑�귛뫝餓ㅴ퍖佯붶빳�욇쎏�뜻�곲���뷩�귛룾餓ε컛�띸쉰�섌뇧`add.ignoreErrors`溫양쉰訝틊rue竊뚥슴�뜻닇訝븅퍡溫ㅸ죱訝뷩��"
#. type: Labeled list
#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:201
@@ -5968,9 +5952,7 @@ msgstr "--no-warn-embedded-repo"
#: en/git-add.txt:178
#, priority:300
msgid "By default, `git add` will warn when adding an embedded repository to the index without using `git submodule add` to create an entry in `.gitmodules`. This option will suppress the warning (e.g., if you are manually performing operations on submodules)."
-msgstr ""
-"容섋��끻넻訝뗰펽`git add`弱녶쑉�묊뇨凉뺞렌�졾탪�ε폀耶섇궓佯볠뿶�묈눣鈺�몜竊뚩�뚥툖鵝욜뵪`git submodule "
-"add`��`.gitmodules`訝�닗兩뷸씉���귝��됮」弱녷뒔�띈��딉펷堊뗥쫩竊뚦쫩�쒏뎸�ⓨ�耶먩Æ�쀦돢烏뚧뱧鵝쒙펹��"
+msgstr "容섋��끻넻訝뗰펽`git add`弱녶쑉�묊뇨凉뺞렌�졾탪�ε폀耶섇궓佯볠뿶�묈눣鈺�몜竊뚩�뚥툖鵝욜뵪`git submodule add`��`.gitmodules`訝�닗兩뷸씉���귝��됮」弱녷뒔�띈��딉펷堊뗥쫩竊뚦쫩�쒏뎸�ⓨ�耶먩Æ�쀦돢烏뚧뱧鵝쒙펹��"
#. type: Labeled list
#: en/git-add.txt:179
@@ -5982,9 +5964,7 @@ msgstr "--renormalize"
#: en/git-add.txt:185
#, priority:300
msgid "Apply the \"clean\" process freshly to all tracked files to forcibly add them again to the index. This is useful after changing `core.autocrlf` configuration or the `text` attribute in order to correct files added with wrong CRLF/LF line endings. This option implies `-u`."
-msgstr ""
-"野방��됭퇎甕ょ쉪�뉏뻑佯붺뵪`clean`瓦뉒쮮竊뚦컛若껂뺄�띷А凉뷴댍曆삣뒥�곁뇨凉뺜릎�귟퓳�ⓩ쎍��`core.autocrlf`�띸쉰��`text`掠욄�㏛빳�닸�曆삣뒥雅녽뵗瑥츮RLF/"
-"LF烏뚨퍜弱양쉪�뉏뻑�롩씆躍멩쐣�ⓦ�귝��됮」�먨맜`-u`�됮」��"
+msgstr "野방��됭퇎甕ょ쉪�뉏뻑佯붺뵪`clean`瓦뉒쮮竊뚦컛若껂뺄�띷А凉뷴댍曆삣뒥�곁뇨凉뺜릎�귟퓳�ⓩ쎍��`core.autocrlf`�띸쉰��`text`掠욄�㏛빳�닸�曆삣뒥雅녽뵗瑥츮RLF/LF烏뚨퍜弱양쉪�뉏뻑�롩씆躍멩쐣�ⓦ�귝��됮」�먨맜`-u`�됮」��"
#. type: Labeled list
#: en/git-add.txt:186 en/git-update-index.txt:86
@@ -5999,47 +5979,43 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr "�띶넍曆삣뒥�뉏뻑�꾢룾�㎬죱鵝띲�귛룾�㎬죱鵝띴퍎�①뇨凉뺜릎�닸뵻竊뚨즯�섆툓�꾣뻼餓뜸퓷�곦툖�섅��"
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr "--pathspec-from-file=<file>"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, fuzzy, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
-msgstr ""
-"Pathspec��`<file>`訝�폖�믭펽�뚥툖��쑉�썰빱烏뚦뢿�겻릎鴉좈�믡�귛쫩��`<file>`閭ｅ���`-`竊뚦닕鵝욜뵪�뉐뇛渦볟뀯�괦athspec�껆킔�켏F�뺺R/"
-"LF�녽슂�귛룾餓ε폊�③뀓營�룜��`core.quotePath`�껺athspec�껆킔竊덅��귟쭅linkgit:git config[1]竊됥�귛룱瑥룟뢿鰲�"
-"`--pathspec-file-nul`�뚦뀲掠�`--literal-pathspecs`��"
+msgstr "Pathspec��`<file>`訝�폖�믭펽�뚥툖��쑉�썰빱烏뚦뢿�겻릎鴉좈�믡�귛쫩��`<file>`閭ｅ���`-`竊뚦닕鵝욜뵪�뉐뇛渦볟뀯�괦athspec�껆킔�켏F�뺺R/LF�녽슂�귛룾餓ε폊�③뀓營�룜��`core.quotePath`�껺athspec�껆킔竊덅��귟쭅linkgit:git config[1]竊됥�귛룱瑥룟뢿鰲�`--pathspec-file-nul`�뚦뀲掠�`--literal-pathspecs`��"
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
-msgstr ""
-"�ゆ쐣�ⓧ슴��`--pathspec-from-file�앮뿶�띷쐣�뤶퉱�괦athspec�껆킔�쭼UL耶쀧Е�녽슂竊뚧��됧끀餓뽩춻寧�꺗�됧춻�€꼷�앾펷�끾떖��죱寧�뭽凉뺝뤇竊됭〃鹽뷩��"
+msgstr "�ゆ쐣�ⓧ슴��`--pathspec-from-file�앮뿶�띷쐣�뤶퉱�괦athspec�껆킔�쭼UL耶쀧Е�녽슂竊뚧��됧끀餓뽩춻寧�꺗�됧춻�€꼷�앾펷�끾떖��죱寧�뭽凉뺝뤇竊됭〃鹽뷩��"
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr "閭ㅹ�됮」��뵪雅롥늽獵삣뫝餓ㅸ죱�됮」�뚧뻼餓뜹닓烏⑨펷壤볠뻼餓뜹릫��꺗熬ヨ�溫ㅴ맏�썰빱烏뚪�됮」�띌씆躍멩쐣�⑨펹��"
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "若욂풃"
@@ -6081,7 +6057,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr "�졽맏瓦쇾릉鹽뷰풃�곮�shell�⒴콝�잌뤇竊덂뜵�얍폀�쀥눣�뉏뻑竊됵펽��餓ε츆訝띶똿��`subdir/git-foo.sh`��"
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "雅ㅴ틨與▼폀"
@@ -6096,8 +6072,7 @@ msgstr "壤볟뫝餓ㅸ퓵�δ벡雅믤Æ凉뤸뿶竊뚦츆弱녷샑鹽�`status`耶먨뫝餓ㅷ쉪渦볟눣
#: en/git-add.txt:244 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
-msgstr ""
-"�썰빱孃ょ렞�양ㅊ��뵪�꾢춴�썰빱�쀨〃竊뚦뭉�먪ㅊ`What now>`�귡�싧만竊뚦퐪�먪ㅊ餓ε뜒訝�`>`瀯볟갼�띰펽�ⓨ룵�썽�됪떓瀯쇿츣�꾡�訝ら�됮」亮띌뵰�쩼eturn竊뚦쫩訝뗦�鹽븝폏"
+msgstr "�썰빱孃ょ렞�양ㅊ��뵪�꾢춴�썰빱�쀨〃竊뚦뭉�먪ㅊ`What now>`�귡�싧만竊뚦퐪�먪ㅊ餓ε뜒訝�`>`瀯볟갼�띰펽�ⓨ룵�썽�됪떓瀯쇿츣�꾡�訝ら�됮」亮띌뵰�쩼eturn竊뚦쫩訝뗦�鹽븝폏"
#. type: delimited block -
#: en/git-add.txt:250
@@ -6135,9 +6110,7 @@ msgstr "--status"
#: en/git-add.txt:264
#, priority:300
msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:"
-msgstr ""
-"瓦쇿컛�양ㅊ驪뤶릉瓮�푶訝딫EAD�뚨뇨凉뺜퉳�당쉪�닸뵻竊덂뜵竊뚦쫩�쒑풏��`git commit`竊뚦컛�먧벡餓�阿덌펹竊뚥빳�딁뇨凉뺝뭽藥δ퐳�묉뻼餓뜸퉳�당쉪�닸뵻竊덂뜵竊뚦쑉渦볟뀯`git "
-"commit`阿뗥뎺竊뚧돢烏�`git add`��빳瓦쎽�閭ζ쉨耶섆�阿덌펹�귞ㅊ堊뗨풏�뷴쫩訝뗰폏"
+msgstr "瓦쇿컛�양ㅊ驪뤶릉瓮�푶訝딫EAD�뚨뇨凉뺜퉳�당쉪�닸뵻竊덂뜵竊뚦쫩�쒑풏��`git commit`竊뚦컛�먧벡餓�阿덌펹竊뚥빳�딁뇨凉뺝뭽藥δ퐳�묉뻼餓뜸퉳�당쉪�닸뵻竊덂뜵竊뚦쑉渦볟뀯`git commit`阿뗥뎺竊뚧돢烏�`git add`��빳瓦쎽�閭ζ쉨耶섆�阿덌펹�귞ㅊ堊뗨풏�뷴쫩訝뗰폏"
#. type: delimited block -
#: en/git-add.txt:269
@@ -6155,10 +6128,7 @@ msgstr ""
#: en/git-add.txt:280
#, priority:300
msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)."
-msgstr ""
-"若껇〃�럈oo.png訝랧EAD�됧뙷�ワ펷鵝녶끀��틠瓦쎾댍�꾬펽�졿��졿퀡�양ㅊ烏뚧빊竊됵펽榮℡폊��쑍�뚦램鵝쒏젒�덃쑍阿뗩뿴亦→쐣�뷴닽竊덂쫩�쒎램鵝쒏젒�덃쑍阿잋툖�뚳펽`nothing`�꾡퐤營�"
-"訝듾폏�양ㅊ`binary`竊됥�귛룱訝�訝ゆ뻼餓턦it "
-"add-{litdd}interactive.perl曆삣뒥雅�403烏뚳펽倻귝옖�먧벡榮℡폊訝�쉪�끻�竊뚦닕�좈솮雅�35烏뚳펽鵝녶램鵝쒏젒�뉏뻑�됮쥫鸚뽨엶�뱄펷訝�轝→렌�졽�轝▼닠�ㅿ펹��"
+msgstr "若껇〃�럈oo.png訝랧EAD�됧뙷�ワ펷鵝녶끀��틠瓦쎾댍�꾬펽�졿��졿퀡�양ㅊ烏뚧빊竊됵펽榮℡폊��쑍�뚦램鵝쒏젒�덃쑍阿뗩뿴亦→쐣�뷴닽竊덂쫩�쒎램鵝쒏젒�덃쑍阿잋툖�뚳펽`nothing`�꾡퐤營�툓鴉싨샑鹽�`binary`竊됥�귛룱訝�訝ゆ뻼餓턦it add-{litdd}interactive.perl曆삣뒥雅�403烏뚳펽倻귝옖�먧벡榮℡폊訝�쉪�끻�竊뚦닕�좈솮雅�35烏뚳펽鵝녶램鵝쒏젒�뉏뻑�됮쥫鸚뽨엶�뱄펷訝�轝→렌�졽�轝▼닠�ㅿ펹��"
#. type: Labeled list
#: en/git-add.txt:281 en/git-update-ref.txt:94
@@ -6170,9 +6140,7 @@ msgstr "update"
#: en/git-add.txt:290
#, priority:300
msgid "This shows the status information and issues an \"Update>>\" prompt. When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything."
-msgstr ""
-"瓦쇿컛�양ㅊ�뜻�곦에��뭉�묈눣�쒏쎍��>>�앮룓鹽뷩�귛퐪�먪ㅊ餓β��>>�앯퍜弱얏뿶竊뚦룾餓θ퓵烏뚦쩀訝ら�됪떓竊뚦뭉�①㈉�쇗닑�쀥뤇瓦욄렏�귚퐷阿잌룾餓θ풏�θ똽�담�귚풃倻귨폏��2-5 7,9�앭컛餓롥닓烏ⓧ릎"
-"�됪떓2��3��4��5��7��9�귛쫩�쒐쐛�δ�訝よ똽�답릎�꾤К雅뚥릉�겼춻竊뚦닕弱녻렩�뽪��됧돥鵝숂쉪烏δ툈�귚풃倻귨폏��7-�앬퍗�쀨〃訝��됪떓7��8��9�귚퐷��빳渦볟뀯��*�앮씎�됪떓�③깿烏δ툈��"
+msgstr "瓦쇿컛�양ㅊ�뜻�곦에��뭉�묈눣�쒏쎍��>>�앮룓鹽뷩�귛퐪�먪ㅊ餓β��>>�앯퍜弱얏뿶竊뚦룾餓θ퓵烏뚦쩀訝ら�됪떓竊뚦뭉�①㈉�쇗닑�쀥뤇瓦욄렏�귚퐷阿잌룾餓θ풏�θ똽�담�귚풃倻귨폏��2-5 7,9�앭컛餓롥닓烏ⓧ릎�됪떓2��3��4��5��7��9�귛쫩�쒐쐛�δ�訝よ똽�답릎�꾤К雅뚥릉�겼춻竊뚦닕弱녻렩�뽪��됧돥鵝숂쉪烏δ툈�귚풃倻귨폏��7-�앬퍗�쀨〃訝��됪떓7��8��9�귚퐷��빳渦볟뀯��*�앮씎�됪떓�③깿烏δ툈��"
#. type: Plain text
#: en/git-add.txt:293
@@ -6326,8 +6294,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"
@@ -6412,7 +6380,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6424,13 +6392,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6458,7 +6426,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6480,7 +6448,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6522,7 +6490,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6552,7 +6520,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6644,37 +6612,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6734,7 +6702,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6746,7 +6714,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6758,7 +6726,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6770,19 +6738,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6794,7 +6762,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6848,115 +6816,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -7042,7 +7011,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7072,8 +7041,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7084,7 +7053,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7156,7 +7125,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7179,8 +7148,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7372,7 +7341,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7402,7 +7371,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7542,7 +7511,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7732,7 +7701,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9294,7 +9263,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9318,7 +9287,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9606,7 +9575,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9730,7 +9699,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10143,7 +10112,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10179,7 +10148,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10398,7 +10367,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10722,13 +10691,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10818,7 +10787,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10969,127 +10938,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
+#, priority:100
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:42
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11565,7 +11540,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11757,7 +11732,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11943,7 +11918,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12679,7 +12654,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12703,7 +12678,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12929,7 +12904,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13495,7 +13470,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13639,7 +13614,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13735,7 +13710,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -14033,7 +14008,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14093,89 +14068,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14382,7 +14333,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14478,7 +14429,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14781,13 +14732,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14797,13 +14748,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14812,19 +14763,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14834,31 +14785,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14868,55 +14819,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14937,18 +14942,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15129,7 +15134,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15388,204 +15393,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15596,7 +15613,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15606,7 +15623,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15616,7 +15633,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15626,7 +15643,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15638,157 +15655,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15798,13 +15815,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15817,19 +15834,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15837,13 +15854,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15930,7 +15947,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19263,7 +19280,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22534,7 +22551,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22923,7 +22940,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23682,7 +23699,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24301,7 +24318,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26065,7 +26082,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26435,7 +26452,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26511,575 +26528,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27117,7 +27152,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30631,7 +30666,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30697,7 +30732,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr "<>"
@@ -30825,97 +30860,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30936,7 +30971,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31444,7 +31479,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33315,7 +33350,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36196,13 +36231,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38340,7 +38375,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38370,487 +38405,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, fuzzy, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr "--strategy-option"
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, fuzzy, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr " --no-stat"
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38858,27 +38960,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38886,154 +38990,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
+#, no-wrap, priority:100
+msgid ""
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, fuzzy, priority:100
msgid "commit"
msgstr "`commit`"
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39042,73 +39331,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39119,25 +39408,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39150,31 +39439,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39188,85 +39477,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39277,13 +39566,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39294,13 +39583,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39311,73 +39600,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39388,19 +39677,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39410,67 +39699,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39484,25 +39773,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39513,7 +39802,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39523,7 +39812,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39532,55 +39821,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39591,13 +39880,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39605,7 +39894,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39617,7 +39906,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39626,37 +39915,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42227,7 +42516,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43959,223 +44248,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, fuzzy, priority:280
msgid "See linkgit:git-add[1]."
msgstr "linkgit:git-add[1]"
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46708,7 +46994,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46718,6 +47004,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46725,97 +47012,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46823,139 +47080,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, fuzzy, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, fuzzy, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46964,31 +47317,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -47000,13 +47353,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47021,13 +47374,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47039,19 +47392,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47066,19 +47419,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47087,7 +47440,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48067,7 +48420,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48245,7 +48598,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48522,19 +48875,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51157,7 +51516,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, fuzzy, no-wrap, priority:240
msgid "<commit>"
msgstr "`commit`"
@@ -51600,311 +51959,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51913,7 +52284,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51923,613 +52294,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
-#, fuzzy, priority:100
-msgid "see linkgit:git-commit-tree[1]"
-msgstr "linkgit:git-commit-tree[1]"
+#: en/git.txt:529
+#, priority:100
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
+msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52544,523 +52951,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -54040,7 +54447,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58373,7 +58792,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
@@ -58801,185 +59220,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58989,7 +59420,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58999,13 +59430,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
@@ -61990,3 +62421,7 @@ msgstr ""
#, priority:300
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+
+#, fuzzy
+#~ msgid "see linkgit:git-commit-tree[1]"
+#~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 3da5347..c11aca5 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-02-11 22:37+0100\n"
+"POT-Creation-Date: 2020-04-04 19:04+0200\n"
"PO-Revision-Date: 2020-03-14 12:37+0000\n"
"Last-Translator: adam chen <adam.cws@gmail.com>\n"
"Language-Team: French\n"
@@ -29,7 +29,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:493
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:343 en/git-fsck.txt:38 en/git-rebase.txt:523
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -77,7 +77,7 @@ msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans f
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:145 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
+#: en/blame-options.txt:25 en/fetch-options.txt:148 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1026
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -125,7 +125,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:455 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:99 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:238 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:485 en/git-request-pull.txt:29 en/git-restore.txt:47 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
@@ -277,7 +277,7 @@ msgid "Ignore revisions listed in `file`, which must be in the same format as an
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
+#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
@@ -709,7 +709,7 @@ msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
+#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193
#, ignore-same, no-wrap, priority:280
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -1657,8 +1657,8 @@ msgstr "linkgit:git-update-ref[1]"
msgid "Update the object name stored in a ref safely."
msgstr ""
-#. type: Plain text
-#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
+#. type: Labeled list
+#: en/cmds-plumbingmanipulators.txt:55
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -2453,61 +2453,61 @@ msgid "The value for a variable that takes a color is a list of colors (at most
msgstr ""
#. type: Plain text
-#: en/config.txt:267
+#: en/config.txt:269
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:279
+#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:291
+#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:292
+#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:298
+#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:301 en/git-imap-send.txt:58
+#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:306
+#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3541,7 +3541,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:345 en/merge-options.txt:90
+#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3553,13 +3553,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:202 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
+#: en/diff-options.txt:23 en/fetch-options.txt:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -4020,7 +4020,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4052,7 +4052,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4088,7 +4088,7 @@ msgid "Specify how differences in submodules are shown. When specifying `--subm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
@@ -4108,7 +4108,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
+#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
@@ -4720,15 +4720,15 @@ msgstr ""
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
-"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
#, priority:280
-msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
@@ -4858,13 +4858,13 @@ msgid "When run from a subdirectory of the project, it can be told to exclude ch
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
+#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:102
+#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
@@ -4900,7 +4900,7 @@ msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
@@ -4942,13 +4942,13 @@ msgid "Show the context between diff hunks, up to the specified number of lines,
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261 en/git-restore.txt:57
+#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:262
+#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
@@ -4960,7 +4960,7 @@ msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:46
+#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
@@ -4972,7 +4972,7 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:219 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:313 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:333 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
+#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
@@ -5008,13 +5008,13 @@ msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
+#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:108
+#: en/diff-options.txt:712 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5104,7 +5104,7 @@ msgid "For more detailed explanation on these common options, see also linkgit:g
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5236,7 +5236,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5248,13 +5248,13 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:365 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:70 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5286,7 +5286,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
+#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5358,7 +5358,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:165 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
@@ -5376,7 +5376,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:344 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
@@ -5400,253 +5400,253 @@ msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:144
+#: en/fetch-options.txt:147
#, priority:220
-msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:146 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
+#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, ignore-same, no-wrap, priority:260
msgid "--tags"
msgstr "--tags"
#. type: Plain text
-#: en/fetch-options.txt:153
+#: en/fetch-options.txt:156
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:154
+#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:164
+#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:165
+#: en/fetch-options.txt:168
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:166
+#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:171
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:176
#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:176
+#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:177 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
+#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:180
+#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:181 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:187
+#: en/fetch-options.txt:190
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:188
+#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:192
+#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:193
+#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:203
+#: en/fetch-options.txt:206
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:210
+#: en/fetch-options.txt:213
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:211 en/git-clone.txt:188
+#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:216
+#: en/fetch-options.txt:219
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:218 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:312 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:332 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
+#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:223
+#: en/fetch-options.txt:226
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:224 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:336 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
+#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:225 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:337 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
+#: en/fetch-options.txt:228 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:366 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:148
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
+#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
msgstr "屋녕눗蘊뉓쮭��"
#. type: Labeled list
-#: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
+#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:234 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:237 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:235 en/git-ls-remote.txt:73 en/git-push.txt:215
+#: en/fetch-options.txt:238 en/git-ls-remote.txt:75 en/git-push.txt:215
#, no-wrap, priority:220
msgid "-o <option>"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:236 en/git-clone.txt:135 en/git-ls-remote.txt:74
+#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
msgstr "--server-option=<�면쟿>"
#. type: Plain text
-#: en/fetch-options.txt:243 en/git-clone.txt:142
+#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244
+#: en/fetch-options.txt:247
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:249
+#: en/fetch-options.txt:252
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:250
+#: en/fetch-options.txt:253
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:256
+#: en/fetch-options.txt:259
#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:257 en/git-push.txt:398
+#: en/fetch-options.txt:260 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:258 en/git-push.txt:399
+#: en/fetch-options.txt:261 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:260 en/git-push.txt:401
+#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:261 en/git-push.txt:402
+#: en/fetch-options.txt:264 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:262 en/git-push.txt:403
+#: en/fetch-options.txt:265 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:263 en/git-push.txt:405
+#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5685,16 +5685,14 @@ msgid ""
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
-"-i] [--patch | -p]\n"
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
-"[--renormalize]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
"\t [--chmod=(+|-)x] [--pathspec-from-file=<茹붹죭瓮�풌> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "沃ゆ삇"
@@ -5709,17 +5707,13 @@ msgstr ""
#: en/git-add.txt:31
#, priority:300
msgid "The \"index\" holds a snapshot of the content of the working tree, and it is this snapshot that is taken as the contents of the next commit. Thus after making any changes to the working tree, and before running the commit command, you must use the `add` command to add any new or modified files to the index."
-msgstr ""
-"�뚨뇨凉뺛�띴릎岳앭춼雅녺빒�띸쉪藥δ퐳與밭쉪恙ョ뀱竊뚧�恙ョ뀱阿잍쐝�싩궨訝뗦А�먧벡�꾢뀱若밤�귛쑉�뜹뎺�꾢램鵝쒏㉨�싦틙餓삡퐬岳�뵻竊뚥빳�듿쑉�룩죱�먧벡 `commit` �뉏빱阿뗥뎺竊뚦퓚�덂뀍�룩죱�졾뀯 "
-"`add` �뉏빱弱뉑뼭罌욄닑岳�뵻�꾣첇旅덂뒥�η뇨凉뺛��"
+msgstr "�뚨뇨凉뺛�띴릎岳앭춼雅녺빒�띸쉪藥δ퐳與밭쉪恙ョ뀱竊뚧�恙ョ뀱阿잍쐝�싩궨訝뗦А�먧벡�꾢뀱若밤�귛쑉�뜹뎺�꾢램鵝쒏㉨�싦틙餓삡퐬岳�뵻竊뚥빳�듿쑉�룩죱�먧벡 `commit` �뉏빱阿뗥뎺竊뚦퓚�덂뀍�룩죱�졾뀯 `add` �뉏빱弱뉑뼭罌욄닑岳�뵻�꾣첇旅덂뒥�η뇨凉뺛��"
#. type: Plain text
#: en/git-add.txt:36
#, priority:300
msgid "This command can be performed multiple times before a commit. It only adds the content of the specified file(s) at the time the add command is run; if you want subsequent changes included in the next commit, then you must run `git add` again to add the new content to the index."
-msgstr ""
-"�ф뙁餓ㅵ룾餓ε쑉�먧벡 `commit` 阿뗥뎺鸚싨А�룩죱�귝쑍�뉏빱�끻뒥�ζ뙁若싨첇旅덄쉪�뜸툔���뗰펽�ε풄瀛뚦컢�뉐츣茹붹죭�됪뼭�꾥츏�뺧펽鵝졾퓚�덂냽�룩죱訝�轝� `git add` "
-"弱뉑뼭罌욅쉪�㎩��졾뀯榮℡폊��"
+msgstr "�ф뙁餓ㅵ룾餓ε쑉�먧벡 `commit` 阿뗥뎺鸚싨А�룩죱�귝쑍�뉏빱�끻뒥�ζ뙁若싨첇旅덄쉪�뜸툔���뗰펽�ε풄瀛뚦컢�뉐츣茹붹죭�됪뼭�꾥츏�뺧펽鵝졾퓚�덂냽�룩죱訝�轝� `git add` 弱뉑뼭罌욅쉪�㎩��졾뀯榮℡폊��"
#. type: Plain text
#: en/git-add.txt:39
@@ -5740,13 +5734,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "linkgit:git-commit[1] �뷴룱訝�葉�컜�㎩��졾뀯�경룓雅ㅴ릎�꾢걳力뺛��"
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:28 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:47 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:43 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:87 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:97 en/git-restore.txt:35 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "�면쟿"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:325 en/git-reset.txt:122 en/git-restore.txt:133 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:357 en/git-commit.txt:362 en/git-grep.txt:326 en/git-reset.txt:122 en/git-restore.txt:133 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<茹붹죭瓮�풌>..."
@@ -5758,7 +5752,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:331
+#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -5776,13 +5770,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:416 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:417 en/git-rebase.txt:558 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:447 en/git-rebase.txt:589 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5806,13 +5800,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:247 en/git-grep.txt:292 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5986,44 +5980,44 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117
+#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
#, fuzzy, no-wrap, priority:300
#| msgid "--ignore-removal"
msgid "--pathspec-from-file=<file>"
msgstr "--ignore-removal"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124
+#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
+#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129
+#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:208 en/git-rm.txt:57
+#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:374 en/git-config.txt:338 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:333 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:160 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:207 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:304 en/git-column.txt:50 en/git-commit.txt:371 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:661 en/git-grep.txt:334 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137 en/git-interpret-trailers.txt:256 en/git-log.txt:119 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:319 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:211 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:128 en/git-restore.txt:139 en/git-revert.txt:122 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "影꾡풃"
@@ -6065,7 +6059,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:613
+#: en/git-add.txt:235 en/git-rebase.txt:749
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "雅믣땿與▼폀"
@@ -6377,7 +6371,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6389,13 +6383,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:246 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:102 en/git-commit.txt:546 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:363 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1211 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:987 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:247 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:103 en/git-commit.txt:547 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:364 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1212 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:988 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6423,7 +6417,7 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
"\t [(<mbox> | <Maildir>)...]\n"
-"'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
#. type: Plain text
@@ -6445,7 +6439,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:409 en/git-revert.txt:98 en/merge-options.txt:77
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:120 en/git-rebase.txt:439 en/git-revert.txt:98 en/merge-options.txt:77
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6487,7 +6481,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:217 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:995
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6517,7 +6511,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:285 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:314 en/git-restore.txt:85 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1015
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6609,37 +6603,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:321 en/git-revert.txt:112
+#: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:350 en/git-revert.txt:112
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:322 en/git-revert.txt:113
+#: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:351 en/git-revert.txt:113
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116
+#: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:354 en/git-revert.txt:116
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:424 en/git-rebase.txt:576
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:396
+#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:355
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6699,7 +6693,7 @@ msgid "Run interactively."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:402 en/git-rebase.txt:543
+#: en/git-am.txt:131 en/git-rebase.txt:432 en/git-rebase.txt:574
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6711,7 +6705,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:403 en/git-rebase.txt:544
+#: en/git-am.txt:138 en/git-rebase.txt:433 en/git-rebase.txt:575
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6723,7 +6717,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:274 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:303 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6735,19 +6729,19 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:326 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:355 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:327 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:331 en/git-revert.txt:96
+#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
@@ -6759,7 +6753,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:428 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
+#: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:458 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1023
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6813,115 +6807,116 @@ msgid "Abort the patching operation but keep HEAD and the index untouched."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:179 en/git-rebase.txt:280
-#, ignore-same, no-wrap, priority:100
-msgid "--show-current-patch"
+#: en/git-am.txt:179
+#, fuzzy, no-wrap, priority:100
+#| msgid "--show-current-patch"
+msgid "--show-current-patch[=(diff|raw)]"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-am.txt:182
+#: en/git-am.txt:184
#, priority:100
-msgid "Show the entire e-mail message \"git am\" has stopped at, because of conflicts."
+msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
msgstr ""
#. type: Title -
-#: en/git-am.txt:184 en/git-commit.txt:468 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-rm.txt:73 en/git-show.txt:81 en/git-stash.txt:189 en/git-tag.txt:231
+#: en/git-am.txt:186 en/git-commit.txt:502 en/git-format-patch.txt:378 en/git-fsck.txt:113 en/git-log.txt:176 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:372 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:192
+#: en/git-am.txt:194
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:195
+#: en/git-am.txt:197
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:200
+#: en/git-am.txt:202
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:203
+#: en/git-am.txt:205
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:205
+#: en/git-am.txt:207
#, priority:100
msgid "three-dashes and end-of-line, or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:206
+#: en/git-am.txt:208
#, priority:100
msgid "a line that begins with \"diff -\", or"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:207
+#: en/git-am.txt:209
#, priority:100
msgid "a line that begins with \"Index: \""
msgstr ""
#. type: Plain text
-#: en/git-am.txt:210
+#: en/git-am.txt:212
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:214
+#: en/git-am.txt:216
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:217
+#: en/git-am.txt:219
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:221
+#: en/git-am.txt:223
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:226
+#: en/git-am.txt:228
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:232
+#: en/git-am.txt:234
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
-#: en/git-am.txt:234 en/git-commit.txt:488 en/git-gc.txt:146
+#: en/git-am.txt:236 en/git-commit.txt:522 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:238
+#: en/git-am.txt:240
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Plain text
-#: en/git-am.txt:242
+#: en/git-am.txt:244
#, ignore-same, priority:100
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-apply[1]."
@@ -7007,7 +7002,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:340 en/merge-options.txt:88
+#: en/git-apply.txt:41 en/git-rebase.txt:369 en/merge-options.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7037,8 +7032,8 @@ msgid "Instead of applying the patch, see if the patch is applicable to the curr
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap, priority:100
+#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
+#, ignore-same, no-wrap, priority:240
msgid "--index"
msgstr "--index"
@@ -7049,7 +7044,7 @@ msgid "When `--check` is in effect, or when applying the patch (which is the def
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, ignore-same, no-wrap, priority:280
msgid "--cached"
msgstr "--cached"
@@ -7121,7 +7116,7 @@ msgid "Remove <n> leading path components (separated by slashes) from traditiona
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:134 en/git-rebase.txt:360
+#: en/git-apply.txt:134
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
@@ -7144,8 +7139,8 @@ msgstr ""
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
-#. type: Labeled list
-#: en/git-apply.txt:145
+#. type: Plain text
+#: en/git-apply.txt:145 en/git-rebase.txt:573
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7337,7 +7332,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:263 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:354 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:181 en/git-merge.txt:353 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7367,7 +7362,7 @@ msgid "When no `--whitespace` flag is given from the command line, this configur
msgstr ""
#. type: Title -
-#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:138
+#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
#, no-wrap, priority:280
msgid "SUBMODULES"
msgstr ""
@@ -7507,7 +7502,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:212 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7697,7 +7692,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:337
+#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
@@ -9259,7 +9254,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:547
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:578
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9283,7 +9278,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9571,7 +9566,7 @@ msgid "The new name for an existing branch. The same restrictions as for <branch
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:63 en/git-tag.txt:112
+#: 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
msgid "--sort=<key>"
msgstr ""
@@ -9695,7 +9690,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -10108,7 +10103,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10144,7 +10139,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:349
+#: en/git-cat-file.txt:52 en/git.txt:363
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10363,7 +10358,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:60 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10687,13 +10682,13 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
-#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
+#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
msgstr ""
@@ -10783,7 +10778,7 @@ msgid "when a value has been assigned to the attribute."
msgstr ""
#. type: Plain text
-#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
+#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -10934,127 +10929,133 @@ msgid "-v, --verbose"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:36
+#: en/git-check-ignore.txt:39
#, priority:100
-msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:45
+#: en/git-check-ignore.txt:42
+#, priority:100
+msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-check-ignore.txt:51
#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:46
+#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:51
+#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:52 en/git-grep.txt:79
+#: en/git-check-ignore.txt:58 en/git-grep.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
-#: en/git-check-ignore.txt:58
+#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:66
+#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:68
+#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:70
+#: en/git-check-ignore.txt:76
#, priority:100
msgid "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:78
+#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:82
+#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:84
+#: en/git-check-ignore.txt:90
#, priority:100
msgid "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:94
+#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:101 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:103
+#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:105
+#: en/git-check-ignore.txt:111
#, priority:100
msgid "One or more of the provided paths is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:106
+#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:108
+#: en/git-check-ignore.txt:114
#, priority:100
msgid "None of the provided paths are ignored."
msgstr ""
#. type: Labeled list
-#: en/git-check-ignore.txt:109
+#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:111
+#: en/git-check-ignore.txt:117
#, priority:100
msgid "A fatal error was encountered."
msgstr ""
#. type: Plain text
-#: en/git-check-ignore.txt:117
+#: en/git-check-ignore.txt:123
#, ignore-same, priority:100
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -11530,7 +11531,7 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
@@ -11722,7 +11723,7 @@ msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entr
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:286 en/git-rebase.txt:551 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
@@ -11908,7 +11909,7 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
+#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -12644,7 +12645,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:267 en/git-rebase.txt:554
+#: en/git-cherry-pick.txt:134 en/git-commit.txt:186 en/git-rebase.txt:295 en/git-rebase.txt:585
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12668,7 +12669,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:300 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
+#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -12894,7 +12895,7 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:369
+#: en/git-cherry.txt:36 en/git.txt:383
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
@@ -13460,7 +13461,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
+#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13604,7 +13605,7 @@ msgid "Create a shallow clone with a history, excluding commits reachable from a
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:229
+#: en/git-clone.txt:229 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -13700,7 +13701,7 @@ msgid "The number of submodules fetched at the same time. Defaults to the `subm
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr ""
@@ -13998,7 +13999,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:331
+#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14058,89 +14059,65 @@ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlie
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:74
+#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:77
+#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:79
+#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:80
+#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:81
+#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:85
-#, priority:100
-msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:92
-#, no-wrap, priority:100
-msgid ""
-"\tGIT_AUTHOR_NAME\n"
-"\tGIT_AUTHOR_EMAIL\n"
-"\tGIT_AUTHOR_DATE\n"
-"\tGIT_COMMITTER_NAME\n"
-"\tGIT_COMMITTER_EMAIL\n"
-"\tGIT_COMMITTER_DATE\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:94
-#, priority:100
-msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:101
-#, priority:100
-msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-commit-tree.txt:105
+#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:109
+#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:114 en/git-commit.txt:494 en/git-config.txt:270 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:439 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
#. type: Plain text
-#: en/git-commit-tree.txt:116
+#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
msgstr ""
+#. type: Plain text
+#: en/git-commit-tree.txt:100
+#, ignore-same, priority:100
+msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]"
+
#. type: Title =
#: en/git-commit.txt:2
#, ignore-same, no-wrap, priority:280
@@ -14347,7 +14324,7 @@ msgid "When doing a dry-run, give the output in the long-format. Implies `--dry
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:207
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
@@ -14443,7 +14420,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:348 en/merge-options.txt:112
+#: en/git-commit.txt:176 en/git-rebase.txt:377 en/merge-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -14746,13 +14723,13 @@ msgid "When pathspec is given on the command line, commit the contents of the fi
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:386
+#: en/git-commit.txt:383
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:392
+#: en/git-commit.txt:389
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14762,13 +14739,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:397
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:405
+#: en/git-commit.txt:402
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -14777,19 +14754,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:410
+#: en/git-commit.txt:407
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:415
+#: en/git-commit.txt:412
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421
+#: en/git-commit.txt:418
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -14799,31 +14776,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:428
+#: en/git-commit.txt:425
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:431 en/git-commit.txt:457
+#: en/git-commit.txt:428 en/git-commit.txt:454
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:435
+#: en/git-commit.txt:432
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:443
+#: en/git-commit.txt:440
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:449
+#: en/git-commit.txt:446
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -14833,55 +14810,109 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:454
+#: en/git-commit.txt:451
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:465
+#: en/git-commit.txt:462
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
+#. type: Title -
+#: en/git-commit.txt:464
+#, no-wrap, priority:280
+msgid "COMMIT INFORMATION"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:468
+#, priority:280
+msgid "Author and committer information is taken from the following environment variables, if set:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:475
+#, no-wrap, priority:280
+msgid ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
+msgstr ""
+
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
+msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:483
+#, priority:280
+msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:490
+#, priority:280
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:494
+#, priority:280
+msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:497
+#, priority:280
+msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
+msgstr ""
+
+#. type: Plain text
+#: en/git-commit.txt:511
+#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:481
+#: en/git-commit.txt:515
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:486
+#: en/git-commit.txt:520
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:492
+#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:496
+#: en/git-commit.txt:530
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:502
+#: en/git-commit.txt:536
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:510
+#: en/git-commit.txt:544
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -14902,18 +14933,18 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
"'git config' [<file-option>] --unset name [value_regex]\n"
"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
-"'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
@@ -15094,7 +15125,7 @@ msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:334
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
@@ -15353,204 +15384,216 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
+#, ignore-same, no-wrap, priority:100
+msgid "--show-scope"
+msgstr "--show-scope"
+
+#. type: Plain text
+#: en/git-config.txt:229
+#, priority:100
+msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:235
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:236
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:242
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:246
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:252
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:257
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:258
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:261
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:267
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:274
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:275
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:277
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:278
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:285
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:286
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:289
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:290
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:292
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:293
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:296
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:302
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:309
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:313
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:319
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:322 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:324
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:328
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:329
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:332
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:341
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:348
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15561,7 +15604,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353 en/git.txt:310
+#: en/git-config.txt:358 en/git.txt:324
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15571,7 +15614,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15581,7 +15624,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15591,7 +15634,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:370
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15603,157 +15646,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:373
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:376
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:381
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:389
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:392
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:396
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:398
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:401
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:404 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:407
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:413
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:416
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:419
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:423
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:426
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:436
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:439
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:442
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:445
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:449
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:455
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -15763,13 +15806,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:459
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:468
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -15782,19 +15825,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:473 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1052 en/git-replace.txt:139 en/git-rm.txt:175 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:249 en/git-rebase.txt:1188 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:478
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15802,13 +15845,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:485
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:490
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -15895,7 +15938,7 @@ msgid "alternate: absolute path of alternate object databases; may appear multip
msgstr ""
#. type: Labeled list
-#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:145
+#: en/git-count-objects.txt:47 en/git-cvsserver.txt:49 en/git-grep.txt:146
#, no-wrap, priority:100
msgid "-H"
msgstr ""
@@ -19228,7 +19271,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:433
+#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -22499,7 +22542,7 @@ msgid "The URL to the remote repository."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
+#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88
#, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
@@ -22888,7 +22931,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1064
+#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23647,7 +23690,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:473
#, priority:100
-msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has 10\\^5 files and 10\\^5 commits, but each commit only modifies 5 files, then git-filter-branch will make you do 10\\^10 modifications, despite only having (at most) 5*10^5 unique blobs."
+msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo. If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
msgstr ""
#. type: Plain text
@@ -24266,7 +24309,7 @@ msgid "The name of a local ref which represents the `@{push}` location for the d
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:362
+#: en/git-for-each-ref.txt:173 en/git.txt:376
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
@@ -26031,7 +26074,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:394
+#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -26401,7 +26444,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
#, priority:100
-msgid "Number of grep worker threads to use. If unset (or set to 0), 8 threads are used by default (for now)."
+msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
msgstr ""
#. type: Labeled list
@@ -26477,575 +26520,593 @@ msgid "Do not pay attention to ignored files specified via the `.gitignore` mech
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:100
+#: en/git-grep.txt:101
#, priority:100
-msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:104
+#: en/git-grep.txt:105
#, priority:100
msgid "Process binary files as if they were text."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:107
+#: en/git-grep.txt:108
#, priority:100
msgid "Honor textconv filter settings."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:111
+#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:116
+#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:117
+#: en/git-grep.txt:118
#, no-wrap, priority:100
msgid "-I"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:119
+#: en/git-grep.txt:120
#, priority:100
msgid "Don't match the pattern in binary files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:120
+#: en/git-grep.txt:121
#, no-wrap, priority:100
msgid "--max-depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:126
+#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:128 en/git-submodule.txt:410
+#: en/git-grep.txt:129 en/git-submodule.txt:410
#, ignore-same, no-wrap, priority:220
msgid "--recursive"
msgstr "--recursive"
#. type: Plain text
-#: en/git-grep.txt:130
+#: en/git-grep.txt:131
#, priority:100
msgid "Same as `--max-depth=-1`; this is the default."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:131
+#: en/git-grep.txt:132
#, ignore-same, no-wrap, priority:100
msgid "--no-recursive"
msgstr "--no-recursive"
#. type: Plain text
-#: en/git-grep.txt:133
+#: en/git-grep.txt:134
#, priority:100
msgid "Same as `--max-depth=0`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:135
+#: en/git-grep.txt:136
#, ignore-same, no-wrap, priority:100
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
-#: en/git-grep.txt:139
+#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:141
+#: en/git-grep.txt:142
#, ignore-same, no-wrap, priority:100
msgid "--invert-match"
msgstr "--invert-match"
#. type: Plain text
-#: en/git-grep.txt:143
+#: en/git-grep.txt:144
#, priority:100
msgid "Select non-matching lines."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:151
+#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
-#: en/git-grep.txt:157 en/git-ls-files.txt:149
+#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:158 en/rev-list-options.txt:82
+#: en/git-grep.txt:159 en/rev-list-options.txt:82
#, no-wrap, priority:260
msgid "-E"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:159 en/rev-list-options.txt:83
+#: en/git-grep.txt:160 en/rev-list-options.txt:83
#, ignore-same, no-wrap, priority:260
msgid "--extended-regexp"
msgstr "--extended-regexp"
#. type: Labeled list
-#: en/git-grep.txt:160
+#: en/git-grep.txt:161
#, no-wrap, priority:100
msgid "-G"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:161 en/rev-list-options.txt:78
+#: en/git-grep.txt:162 en/rev-list-options.txt:78
#, ignore-same, no-wrap, priority:260
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
-#: en/git-grep.txt:164
+#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:166 en/rev-list-options.txt:93
+#: en/git-grep.txt:167 en/rev-list-options.txt:93
#, ignore-same, no-wrap, priority:260
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
-#: en/git-grep.txt:168
+#: en/git-grep.txt:169
#, priority:100
msgid "Use Perl-compatible regular expressions for patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:172 en/rev-list-options.txt:100
+#: en/git-grep.txt:173 en/rev-list-options.txt:100
#, priority:260
msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:173 en/git-repack.txt:74 en/rev-list-options.txt:87
+#: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
#, no-wrap, priority:260
msgid "-F"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:174 en/rev-list-options.txt:88
+#: en/git-grep.txt:175 en/rev-list-options.txt:88
#, ignore-same, no-wrap, priority:260
msgid "--fixed-strings"
msgstr "--fixed-strings"
#. type: Plain text
-#: en/git-grep.txt:177
+#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:179
+#: en/git-grep.txt:180
#, ignore-same, no-wrap, priority:100
msgid "--line-number"
msgstr "--line-number"
#. type: Plain text
-#: en/git-grep.txt:181
+#: en/git-grep.txt:182
#, priority:100
msgid "Prefix the line number to matching lines."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:182
+#: en/git-grep.txt:183
#, ignore-same, no-wrap, priority:100
msgid "--column"
msgstr "--column"
#. type: Plain text
-#: en/git-grep.txt:185
+#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:187
+#: en/git-grep.txt:188
#, ignore-same, no-wrap, priority:100
msgid "--files-with-matches"
msgstr "--files-with-matches"
#. type: Labeled list
-#: en/git-grep.txt:189
+#: en/git-grep.txt:190
#, no-wrap, priority:100
msgid "-L"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:190
+#: en/git-grep.txt:191
#, ignore-same, no-wrap, priority:100
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
-#: en/git-grep.txt:195
+#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:196
+#: en/git-grep.txt:197
#, no-wrap, priority:100
msgid "-O[<pager>]"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:197
+#: en/git-grep.txt:198
#, no-wrap, priority:100
msgid "--open-files-in-pager[=<pager>]"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:205
+#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:210
+#: en/git-grep.txt:211
#, priority:100
msgid "Output \\0 instead of the character that normally follows a file name."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:212
+#: en/git-grep.txt:213
#, ignore-same, no-wrap, priority:100
msgid "--only-matching"
msgstr "--only-matching"
#. type: Plain text
-#: en/git-grep.txt:215
+#: en/git-grep.txt:216
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:217 en/rev-list-options.txt:975
+#: en/git-grep.txt:218 en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
#. type: Plain text
-#: en/git-grep.txt:220
+#: en/git-grep.txt:221
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:224
+#: en/git-grep.txt:225
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:229
+#: en/git-grep.txt:230
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:230
+#: en/git-grep.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--break"
msgstr "--break"
#. type: Plain text
-#: en/git-grep.txt:232
+#: en/git-grep.txt:233
#, priority:100
msgid "Print an empty line between matches from different files."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:233
+#: en/git-grep.txt:234
#, ignore-same, no-wrap, priority:100
msgid "--heading"
msgstr "--heading"
#. type: Plain text
-#: en/git-grep.txt:236
+#: en/git-grep.txt:237
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:238
+#: en/git-grep.txt:239
#, ignore-same, no-wrap, priority:100
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
-#: en/git-grep.txt:244
+#: en/git-grep.txt:245
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:245
+#: en/git-grep.txt:246
#, no-wrap, priority:100
msgid "-<num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:246
+#: en/git-grep.txt:247
#, no-wrap, priority:100
msgid "-C <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:247
+#: en/git-grep.txt:248
#, no-wrap, priority:100
msgid "--context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:250
+#: en/git-grep.txt:251
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:251
+#: en/git-grep.txt:252
#, no-wrap, priority:100
msgid "-A <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:252
+#: en/git-grep.txt:253
#, no-wrap, priority:100
msgid "--after-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:255
+#: en/git-grep.txt:256
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:256
+#: en/git-grep.txt:257
#, no-wrap, priority:100
msgid "-B <num>"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:257
+#: en/git-grep.txt:258
#, no-wrap, priority:100
msgid "--before-context <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:260
+#: en/git-grep.txt:261
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:267
+#: en/git-grep.txt:268
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:268
+#: en/git-grep.txt:269
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:271
+#: en/git-grep.txt:272
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:272
+#: en/git-grep.txt:273
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:275
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:278
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:283
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:288
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:291
+#: en/git-grep.txt:292
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:297
+#: en/git-grep.txt:298
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:298
+#: en/git-grep.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:299
+#: en/git-grep.txt:300
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:300 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:301 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:302
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:306
+#: en/git-grep.txt:307
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:307 en/rev-list-options.txt:65
+#: en/git-grep.txt:308 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:312
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:317
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:317
+#: en/git-grep.txt:318
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:320
+#: en/git-grep.txt:321
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:324
+#: en/git-grep.txt:325
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:328
+#: en/git-grep.txt:329
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:335
+#: en/git-grep.txt:336
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:338
+#: en/git-grep.txt:339
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:339
+#: en/git-grep.txt:340
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:342
+#: en/git-grep.txt:343
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:343
+#: en/git-grep.txt:344
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:346
+#: en/git-grep.txt:347
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:347
+#: en/git-grep.txt:348
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:350
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
+#. type: Title -
+#: en/git-grep.txt:352
+#, no-wrap, priority:100
+msgid "NOTES ON THREADS"
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:356
+#, priority:100
+msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
+msgstr ""
+
+#. type: Plain text
+#: en/git-grep.txt:361
+#, priority:100
+msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
+msgstr ""
+
#. type: Title =
#: en/git-gui.txt:2
#, ignore-same, no-wrap, priority:100
@@ -27083,7 +27144,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -30600,7 +30661,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:535
+#: en/git-ls-files.txt:132 en/git.txt:572
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -30666,7 +30727,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:353 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -30791,97 +30852,97 @@ msgid "--heads"
msgstr "--heads"
#. type: Plain text
-#: en/git-ls-remote.txt:32
+#: en/git-ls-remote.txt:34
#, priority:100
-msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed."
+msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:33
+#: en/git-ls-remote.txt:35
#, ignore-same, no-wrap, priority:100
msgid "--refs"
msgstr "--refs"
#. type: Plain text
-#: en/git-ls-remote.txt:35
+#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:39
+#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:40
+#: en/git-ls-remote.txt:42
#, no-wrap, priority:100
msgid "--upload-pack=<exec>"
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:45
+#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:51
+#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:52
+#: en/git-ls-remote.txt:54
#, ignore-same, no-wrap, priority:100
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
-#: en/git-ls-remote.txt:56
+#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
-#: en/git-ls-remote.txt:57
+#: en/git-ls-remote.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--symref"
msgstr "--symref"
#. type: Plain text
-#: en/git-ls-remote.txt:62
+#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:72
+#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:80
+#: en/git-ls-remote.txt:82
#, priority:100
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:85
+#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:91
+#: en/git-ls-remote.txt:93
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
#. type: delimited block -
-#: en/git-ls-remote.txt:111
+#: en/git-ls-remote.txt:113
#, no-wrap, priority:100
msgid ""
"$ git ls-remote --tags ./.\n"
@@ -30902,7 +30963,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-remote.txt:116
+#: en/git-ls-remote.txt:118
#, ignore-same, priority:100
msgid "linkgit:git-check-ref-format[1]."
msgstr "linkgit:git-check-ref-format[1]."
@@ -31410,7 +31471,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:376
+#: en/git-merge-base.txt:60 en/git-rebase.txt:405
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33281,7 +33342,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:299 en/merge-options.txt:116
+#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -36162,13 +36223,13 @@ msgid "Override earlier --rebase."
msgstr ""
#. type: Labeled list
-#: en/git-pull.txt:136 en/git-rebase.txt:524
+#: en/git-pull.txt:136 en/git-rebase.txt:554
#, ignore-same, no-wrap, priority:220
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-pull.txt:137 en/git-rebase.txt:525
+#: en/git-pull.txt:137 en/git-rebase.txt:555
#, ignore-same, no-wrap, priority:220
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -38306,7 +38367,7 @@ msgid "Although both this option and --fork-point find the merge base between <u
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:266 en/git-rebase.txt:273 en/git-rebase.txt:298 en/git-rebase.txt:311 en/git-rebase.txt:320 en/git-rebase.txt:362 en/git-rebase.txt:401 en/git-rebase.txt:408 en/git-rebase.txt:415 en/git-rebase.txt:427 en/git-rebase.txt:467 en/git-rebase.txt:492 en/git-rebase.txt:504 en/git-rebase.txt:523
+#: en/git-rebase.txt:237 en/git-rebase.txt:267 en/git-rebase.txt:285 en/git-rebase.txt:302 en/git-rebase.txt:327 en/git-rebase.txt:340 en/git-rebase.txt:349 en/git-rebase.txt:391 en/git-rebase.txt:431 en/git-rebase.txt:438 en/git-rebase.txt:445 en/git-rebase.txt:457 en/git-rebase.txt:497 en/git-rebase.txt:522 en/git-rebase.txt:534 en/git-rebase.txt:553
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -38336,487 +38397,554 @@ msgid "Abort the rebase operation but HEAD is not reset back to the original bra
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261 en/git-rebase.txt:560
+#: en/git-rebase.txt:265
+#, no-wrap, priority:100
+msgid ""
+"--apply:\n"
+"\tUse applying strategies to rebase (calling `git-am`\n"
+"\tinternally). This option may become a no-op in the future\n"
+"\tonce the merge backend handles everything the apply one does.\n"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:268
+#, no-wrap, priority:100
+msgid "--empty={drop,keep,ask}"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:279
+#, priority:100
+msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:283
+#, ignore-ellipsis, priority:100
+msgid "Note that commits which start empty are kept, and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are always dropped."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:286 en/git-rebase.txt:591
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:264
+#: en/git-rebase.txt:292
+#, priority:100
+msgid "No-op. Rebasing commits that started empty (had no change relative to their parent) used to fail and this option would override that behavior, allowing commits with empty changes to be rebased. Now commits with no changes do not cause rebasing to halt."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:294
#, priority:100
-msgid "Keep the commits that do not change anything from its parents in the result."
+msgid "See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:271
+#: en/git-rebase.txt:300
#, priority:100
-msgid "By default, rebasing commits with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be rebased."
+msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:276
+#: en/git-rebase.txt:305
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:277 en/git-rebase.txt:561
+#: en/git-rebase.txt:306 en/git-rebase.txt:593
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:279
+#: en/git-rebase.txt:308
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:309
+#, ignore-same, no-wrap, priority:100
+msgid "--show-current-patch"
+msgstr "--show-current-patch"
+
#. type: Plain text
-#: en/git-rebase.txt:284
+#: en/git-rebase.txt:313
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:290
+#: en/git-rebase.txt:319
#, priority:100
-msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:296
+#: en/git-rebase.txt:325
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:304
+#: en/git-rebase.txt:333
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309
+#: en/git-rebase.txt:338
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:312
+#: en/git-rebase.txt:341
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:313
+#: en/git-rebase.txt:342
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:318
+#: en/git-rebase.txt:347
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:335
+#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:339
+#: en/git-rebase.txt:368
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:343
+#: en/git-rebase.txt:372
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:347
+#: en/git-rebase.txt:376
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:350
+#: en/git-rebase.txt:379
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:351 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:380 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:354
+#: en/git-rebase.txt:383
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
+#. type: Plain text
+#: en/git-rebase.txt:389
+#, priority:100
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
+msgstr ""
+
#. type: Labeled list
-#: en/git-rebase.txt:363 en/merge-options.txt:43
+#: en/git-rebase.txt:392 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:364
+#: en/git-rebase.txt:393
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:369
+#: en/git-rebase.txt:398
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:375
+#: en/git-rebase.txt:404
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:377
+#: en/git-rebase.txt:406
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:381
+#: en/git-rebase.txt:410
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:387
+#: en/git-rebase.txt:416
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:390
+#: en/git-rebase.txt:419
#, priority:100
msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:394
+#: en/git-rebase.txt:423
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:429
#, priority:100
-msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch."
+msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:406
+#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:413
+#: en/git-rebase.txt:443
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:421
+#: en/git-rebase.txt:451
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:425
+#: en/git-rebase.txt:455
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:429
+#: en/git-rebase.txt:459
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:437
+#: en/git-rebase.txt:467
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:444
+#: en/git-rebase.txt:474
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:448
+#: en/git-rebase.txt:478
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:452
+#: en/git-rebase.txt:482
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:484
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:456 en/git-rebase.txt:557
+#: en/git-rebase.txt:486 en/git-rebase.txt:588
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:461
+#: en/git-rebase.txt:491
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:465
+#: en/git-rebase.txt:495
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:468
+#: en/git-rebase.txt:498
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:469
+#: en/git-rebase.txt:499
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:474
+#: en/git-rebase.txt:504
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:477
+#: en/git-rebase.txt:507
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:479
+#: en/git-rebase.txt:509
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:481
+#: en/git-rebase.txt:511
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:483
+#: en/git-rebase.txt:513
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:487
+#: en/git-rebase.txt:517
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:490
+#: en/git-rebase.txt:520
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:502
+#: en/git-rebase.txt:532
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:505
+#: en/git-rebase.txt:535
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:506
+#: en/git-rebase.txt:536
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:517
+#: en/git-rebase.txt:547
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:551
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:531
+#: en/git-rebase.txt:561
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:562
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:533
+#: en/git-rebase.txt:563
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:566
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:538
+#: en/git-rebase.txt:568
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:571
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:545
+#: en/git-rebase.txt:577
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:549
+#: en/git-rebase.txt:580
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:552
+#: en/git-rebase.txt:583
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:553
+#: en/git-rebase.txt:584
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:555
+#: en/git-rebase.txt:586
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:556 en/git-svn.txt:680
+#: en/git-rebase.txt:587 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:559
+#: en/git-rebase.txt:590
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:562
+#: en/git-rebase.txt:592
+#, fuzzy, priority:100
+#| msgid "--empty"
+msgid "--empty="
+msgstr "--empty"
+
+#. type: Plain text
+#: en/git-rebase.txt:594
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:564
+#: en/git-rebase.txt:596
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:566
+#: en/git-rebase.txt:598
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:567
+#: en/git-rebase.txt:599
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:568
+#: en/git-rebase.txt:600
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:601
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --empty="
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:602
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:570
+#: en/git-rebase.txt:603
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:605
#, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:575
+#: en/git-rebase.txt:614
#, no-wrap, priority:100
-msgid "There are some subtle differences how the backends behave.\n"
+msgid ""
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:578
+#: en/git-rebase.txt:617
#, no-wrap, priority:100
msgid ""
"Empty commits\n"
@@ -38824,27 +38952,29 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:583
+#: en/git-rebase.txt:622
#, no-wrap, priority:100
msgid ""
-"The am backend drops any \"empty\" commits, regardless of whether the\n"
-"commit started empty (had no changes relative to its parent to\n"
-"start with) or ended empty (all changes were already applied\n"
-"upstream in other commits).\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+"commits that started empty, though these are rare in practice. It\n"
+"also drops commits that become empty and has no option for controlling\n"
+"this behavior.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:629
#, no-wrap, priority:100
msgid ""
-"The interactive backend drops commits by default that\n"
-"started empty and halts if it hits a commit that ended up empty.\n"
-"The `--keep-empty` option exists for the interactive backend to allow\n"
-"it to keep commits that started empty.\n"
+"The merge backend keeps intentionally empty commits. Similar to the\n"
+"apply backend, by default the merge backend drops commits that become\n"
+"empty unless -i/--interactive is specified (in which case it stops and\n"
+"asks the user what to do). The merge backend also has an\n"
+"--empty={drop,keep,ask} option for changing the behavior of handling\n"
+"commits that become empty.\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:591
+#: en/git-rebase.txt:632
#, no-wrap, priority:100
msgid ""
"Directory rename detection\n"
@@ -38852,154 +38982,339 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:595
+#: en/git-rebase.txt:641
+#, no-wrap, priority:100
+msgid ""
+"Due to the lack of accurate tree information (arising from\n"
+"constructing fake ancestors with the limited information available in\n"
+"patches), directory rename detection is disabled in the apply backend.\n"
+"Disabled directory rename detection means that if one side of history\n"
+"renames a directory and the other adds new files to the old directory,\n"
+"then the new files will be left behind in the old directory without\n"
+"any warning at the time of rebasing that you may want to move these\n"
+"files into the new directory.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:644
+#, no-wrap, priority:100
+msgid ""
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:647
+#, no-wrap, priority:100
+msgid ""
+"Context\n"
+"~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:662
+#, no-wrap, priority:100
+msgid ""
+"The apply backend works by creating a sequence of patches (by calling\n"
+"`format-patch` internally), and then applying the patches in sequence\n"
+"(calling `am` internally). Patches are composed of multiple hunks,\n"
+"each with line numbers, a context region, and the actual changes. The\n"
+"line numbers have to be taken with some fuzz, since the other side\n"
+"will likely have inserted or deleted lines earlier in the file. The\n"
+"context region is meant to help find how to adjust the line numbers in\n"
+"order to apply the changes to the right lines. However, if multiple\n"
+"areas of the code have the same surrounding lines of context, the\n"
+"wrong one can be picked. There are real-world cases where this has\n"
+"caused commits to be reapplied incorrectly with no conflicts reported.\n"
+"Setting diff.context to a larger value may prevent such types of\n"
+"problems, but increases the chance of spurious conflicts (since it\n"
+"will require more lines of matching context to apply).\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:665
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:668
+#, no-wrap, priority:100
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:679
+#, no-wrap, priority:100
+msgid ""
+"When there are content conflicts, the merge machinery tries to\n"
+"annotate each side's conflict markers with the commits where the\n"
+"content came from. Since the apply backend drops the original\n"
+"information about the rebased commits and their parents (and instead\n"
+"generates new fake commits based off limited information in the\n"
+"generated patches), those commits cannot be identified; instead it has\n"
+"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+"set to diff3, the apply backend will use \"constructed merge base\" to\n"
+"label the content from the merge base, and thus provide no information\n"
+"about the merge base commit whatsoever.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:682
+#, no-wrap, priority:100
+msgid ""
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:685
+#, no-wrap, priority:100
+msgid ""
+"Hooks\n"
+"~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:690
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. However, this was by accident of\n"
+"implementation rather than by design. Both backends should have the\n"
+"same behavior, though it is not clear which one is correct.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:693
+#, no-wrap, priority:100
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:701
+#, no-wrap, priority:100
+msgid ""
+"The apply backend has safety problems with an ill-timed interrupt; if\n"
+"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+"the rebase can enter a state where it cannot be aborted with a\n"
+"subsequent `git rebase --abort`. The merge backend does not appear to\n"
+"suffer from the same shortcoming. (See\n"
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+"details.)\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:704
+#, no-wrap, priority:100
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:711
+#, no-wrap, priority:100
+msgid ""
+"When a conflict occurs while rebasing, rebase stops and asks the user\n"
+"to resolve. Since the user may need to make notable changes while\n"
+"resolving conflicts, after conflicts are resolved and the user has run\n"
+"`git rebase --continue`, the rebase should open an editor and ask the\n"
+"user to update the commit message. The merge backend does this, while\n"
+"the apply backend blindly applies the original commit message.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:714
+#, no-wrap, priority:100
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:718
+#, no-wrap, priority:100
+msgid ""
+"There are a few more behavioral differences that most folks would\n"
+"probably consider inconsequential but which are mentioned for\n"
+"completeness:\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:722
+#, no-wrap, priority:100
+msgid ""
+"* Reflog: The two backends will use different wording when describing\n"
+" the changes made in the reflog, though both will make use of the\n"
+" word \"rebase\".\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:728
+#, ignore-ellipsis, no-wrap, priority:100
+msgid ""
+"* Progress, informational, and error messages: The two backends\n"
+" provide slightly different progress and informational messages.\n"
+" Also, the apply backend writes error messages (such as \"Your files\n"
+" would be overwritten...\") to stdout, while the merge backend writes\n"
+" them to stderr.\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
msgid ""
-"Directory rename heuristics are enabled in the merge and interactive\n"
-"backends. Due to the lack of accurate tree information, directory\n"
-"rename detection is disabled in the am backend.\n"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:597
+#: en/git-rebase.txt:733
#, no-wrap, priority:100
msgid "include::merge-strategies.txt[]\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:735
#, no-wrap, priority:100
msgid "NOTES\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:604
+#: en/git-rebase.txt:740
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:609
+#: en/git-rebase.txt:745
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:611
+#: en/git-rebase.txt:747
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:618
+#: en/git-rebase.txt:754
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:756
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:622
+#: en/git-rebase.txt:758
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:759
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:624
+#: en/git-rebase.txt:760
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:625
+#: en/git-rebase.txt:761
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:763
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:765
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:631
+#: en/git-rebase.txt:767
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:768
#, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:770
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:772
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:773
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:774
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:644
+#: en/git-rebase.txt:780
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:646
+#: en/git-rebase.txt:782
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:648
+#: en/git-rebase.txt:784
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:653
+#: en/git-rebase.txt:789
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:658
+#: en/git-rebase.txt:794
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39008,73 +39323,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:663
+#: en/git-rebase.txt:799
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:668
+#: en/git-rebase.txt:804
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:671
+#: en/git-rebase.txt:807
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:674
+#: en/git-rebase.txt:810
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:677
+#: en/git-rebase.txt:813
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:685
+#: en/git-rebase.txt:821
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:689
+#: en/git-rebase.txt:825
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:693
+#: en/git-rebase.txt:829
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:696
+#: en/git-rebase.txt:832
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:699
+#: en/git-rebase.txt:835
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:702
+#: en/git-rebase.txt:838
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:709
+#: en/git-rebase.txt:845
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39085,25 +39400,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:713
+#: en/git-rebase.txt:849
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:716
+#: en/git-rebase.txt:852
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:723
+#: en/git-rebase.txt:859
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:732
+#: en/git-rebase.txt:868
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39116,31 +39431,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:737
+#: en/git-rebase.txt:873
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:742
+#: en/git-rebase.txt:878
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:745
+#: en/git-rebase.txt:881
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:749
+#: en/git-rebase.txt:885
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:759
+#: en/git-rebase.txt:895
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39154,85 +39469,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:762
+#: en/git-rebase.txt:898
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:768
+#: en/git-rebase.txt:904
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:772
+#: en/git-rebase.txt:908
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:774
+#: en/git-rebase.txt:910
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:778
+#: en/git-rebase.txt:914
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:782
+#: en/git-rebase.txt:918
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:785
+#: en/git-rebase.txt:921
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:787
+#: en/git-rebase.txt:923
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:789
+#: en/git-rebase.txt:925
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:794
+#: en/git-rebase.txt:930
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:933
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:940
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:945
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:816
+#: en/git-rebase.txt:952
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39243,13 +39558,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:819
+#: en/git-rebase.txt:955
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:826
+#: en/git-rebase.txt:962
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39260,13 +39575,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:966
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:837
+#: en/git-rebase.txt:973
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39277,73 +39592,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:980
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:846
+#: en/git-rebase.txt:982
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:847
+#: en/git-rebase.txt:983
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:851
+#: en/git-rebase.txt:987
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:852
+#: en/git-rebase.txt:988
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:859
+#: en/git-rebase.txt:995
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:862
+#: en/git-rebase.txt:998
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:867
+#: en/git-rebase.txt:1003
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:1007
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:873
+#: en/git-rebase.txt:1009
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:1011
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:881
+#: en/git-rebase.txt:1017
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39354,19 +39669,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:1021
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:889
+#: en/git-rebase.txt:1025
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:894
+#: en/git-rebase.txt:1030
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -39376,67 +39691,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:1035
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:903
+#: en/git-rebase.txt:1039
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:906
+#: en/git-rebase.txt:1042
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:1045
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:911
+#: en/git-rebase.txt:1047
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:916
+#: en/git-rebase.txt:1052
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:1054
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:926
+#: en/git-rebase.txt:1062
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:930
+#: en/git-rebase.txt:1066
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:1071
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:1081
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -39450,25 +39765,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:952
+#: en/git-rebase.txt:1088
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:955
+#: en/git-rebase.txt:1091
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:958 en/git-rebase.txt:1035
+#: en/git-rebase.txt:1094 en/git-rebase.txt:1171
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:1100
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -39479,7 +39794,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:969
+#: en/git-rebase.txt:1105
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -39489,7 +39804,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:1109
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39498,55 +39813,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:977
+#: en/git-rebase.txt:1113
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:985
+#: en/git-rebase.txt:1121
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:992
+#: en/git-rebase.txt:1128
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:998
+#: en/git-rebase.txt:1134
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1001
+#: en/git-rebase.txt:1137
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1008
+#: en/git-rebase.txt:1144
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1148
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1019
+#: en/git-rebase.txt:1155
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1026
+#: en/git-rebase.txt:1162
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -39557,13 +39872,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1168
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1174
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -39571,7 +39886,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1181
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39583,7 +39898,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1049
+#: en/git-rebase.txt:1185
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -39592,37 +39907,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1196
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1198
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1066
+#: en/git-rebase.txt:1202
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1204
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1208
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -42194,7 +42509,7 @@ msgid "After inspecting the result of the merge, you may find that the change in
msgstr ""
#. type: Labeled list
-#: en/git-reset.txt:250 en/git-stash.txt:230
+#: en/git-reset.txt:250 en/git-stash.txt:286
#, no-wrap, priority:280
msgid "Interrupted workflow"
msgstr ""
@@ -43928,223 +44243,220 @@ msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:12
+#: en/git-rm.txt:14
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:25
+#: en/git-rm.txt:27
#, priority:280
-msgid "Remove files from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
+msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
-#. type: Labeled list
-#: en/git-rm.txt:29
-#, ignore-ellipsis, no-wrap, priority:280
-msgid "<file>..."
+#. type: Plain text
+#: en/git-rm.txt:36
+#, priority:280
+msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
#, priority:280
-msgid "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
+msgid "The command removes only the paths that are known to Git."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:42
+#: en/git-rm.txt:43
+#, priority:280
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rm.txt:49
#, priority:280
msgid "Override the up-to-date check."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:48
+#: en/git-rm.txt:55
#, priority:280
msgid "Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:52
+#: en/git-rm.txt:59
#, priority:280
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:62
+#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:63
+#: en/git-rm.txt:70
#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
#. type: Plain text
-#: en/git-rm.txt:65
+#: en/git-rm.txt:72
#, priority:280
msgid "Exit with a zero status even if no files matched."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:70
+#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
msgstr ""
-#. type: Plain text
-#: en/git-rm.txt:79
-#, priority:280
-msgid "The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of a file that you have not told Git about does not remove that file."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rm.txt:84
-#, priority:280
-msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-
#. type: Title -
-#: en/git-rm.txt:86
+#: en/git-rm.txt:93
#, no-wrap, priority:280
msgid "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:91
+#: en/git-rm.txt:98
#, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:93
+#: en/git-rm.txt:100
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:100
+#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:102
+#: en/git-rm.txt:109
#, no-wrap, priority:280
msgid "Using ``git add -A''"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:106
+#: en/git-rm.txt:113
#, priority:280
msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:109
+#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:112
+#: en/git-rm.txt:119
#, no-wrap, priority:280
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:116
+#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:119
+#: en/git-rm.txt:126
#, priority:280
msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:122
+#: en/git-rm.txt:129
#, no-wrap, priority:280
msgid "git add -A\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:125
+#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
msgstr ""
#. type: Title ~
-#: en/git-rm.txt:127
+#: en/git-rm.txt:134
#, no-wrap, priority:280
msgid "Other ways"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:132
+#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
-#: en/git-rm.txt:135
+#: en/git-rm.txt:142
#, no-wrap, priority:280
msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:148
+#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:154
+#: en/git-rm.txt:161
#, priority:280
msgid "A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:158
+#: en/git-rm.txt:165
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:161
+#: en/git-rm.txt:168
#, no-wrap, priority:280
msgid "`git rm Documentation/\\*.txt`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:164
+#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:168
+#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
msgstr ""
#. type: Labeled list
-#: en/git-rm.txt:169
+#: en/git-rm.txt:176
#, no-wrap, priority:280
msgid "`git rm -f git-*.sh`"
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:173
+#: en/git-rm.txt:180
#, priority:280
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
msgstr ""
#. type: Plain text
-#: en/git-rm.txt:182
+#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
@@ -46673,7 +46985,7 @@ msgid "git-stash - Stash the changes in a dirty working directory away"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:22
+#: en/git-stash.txt:23
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
@@ -46683,6 +46995,7 @@ msgid ""
"'git stash' branch <branchname> [<stash>]\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=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]]\n"
"'git stash' clear\n"
"'git stash' create [<message>]\n"
@@ -46690,97 +47003,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:30
+#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:38
+#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:45
+#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:49
+#: en/git-stash.txt:50
#, ignore-ellipsis, no-wrap, priority:240
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:55
+#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:61
-#, priority:240
-msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:67
-#, priority:240
-msgid "When pathspec is given to 'git stash push', the new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:70
-#, priority:240
-msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:75
-#, priority:240
-msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:83
+#: en/git-stash.txt:62
#, priority:240
-msgid "With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:86
-#, priority:240
-msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:87
+#: en/git-stash.txt:63
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:93
+#: en/git-stash.txt:69
#, priority:240
-msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspecs. Instead, all non-option arguments are concatenated to form the stash message."
+msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:94
+#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:101
+#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:105
+#: en/git-stash.txt:81
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
@@ -46788,139 +47071,235 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:109
+#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:110
+#: en/git-stash.txt:86
#, no-wrap, priority:240
msgid "show [<options>] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:120
+#: en/git-stash.txt:96
#, priority:240
-msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
+msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:121
+#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:127
+#: en/git-stash.txt:103
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:131
+#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
-#. type: Plain text
-#: en/git-stash.txt:136
-#, priority:240
-msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-
-#. type: Plain text
-#: en/git-stash.txt:139
-#, priority:240
-msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-stash.txt:140
+#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:145
+#: en/git-stash.txt:113
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:146
+#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:154
+#: en/git-stash.txt:121
#, priority:240
-msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` is given, applies the latest one."
+msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:160
+#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:161
+#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:165
+#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:166
+#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:172
+#: en/git-stash.txt:136
#, priority:240
-msgid "Remove a single stash entry from the list of stash entries. When no `<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash log reference of the form `stash@{<revision>}`."
+msgid "Remove a single stash entry from the list of stash entries."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:173 en/git-update-ref.txt:100
+#: en/git-stash.txt:137 en/git-update-ref.txt:100
#, ignore-same, no-wrap, priority:240
msgid "create"
msgstr "create"
#. type: Plain text
-#: en/git-stash.txt:180
+#: en/git-stash.txt:144
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:181
+#: en/git-stash.txt:145
#, no-wrap, priority:240
msgid "store"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:187
+#: en/git-stash.txt:151
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:196
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#, priority:240
+msgid "This option is only valid for `push` and `save` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:160
+#, priority:240
+msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:162
+#, ignore-same, no-wrap, priority:240
+msgid "--include-untracked"
+msgstr "--include-untracked"
+
+#. type: Plain text
+#: en/git-stash.txt:167
+#, priority:240
+msgid "All untracked files are also stashed and then cleaned up with `git clean`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:170
+#, priority:240
+msgid "This option is only valid for `pop` and `apply` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:175
+#, priority:240
+msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:177
+#, ignore-same, no-wrap, priority:240
+msgid "--keep-index"
+msgstr "--keep-index"
+
+#. type: Labeled list
+#: en/git-stash.txt:178
+#, ignore-same, no-wrap, priority:240
+msgid "--no-keep-index"
+msgstr "--no-keep-index"
+
+#. type: Plain text
+#: en/git-stash.txt:182
+#, priority:240
+msgid "All changes already added to the index are left intact."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:194
+#, priority:240
+msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:197
+#, priority:240
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#, priority:240
+msgid "This option is only valid for `push` command."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:219
+#, priority:240
+msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:226
+#, priority:240
+msgid "Separates pathspec from options for disambiguation purposes."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:234
+#, priority:240
+msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-stash.txt:237
+#, no-wrap, priority:240
+msgid "<stash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:240
+#, priority:240
+msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:243
+#, priority:240
+msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200
+#: en/git-stash.txt:256
#, no-wrap, priority:240
msgid ""
" .----W\n"
@@ -46929,31 +47308,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:204
+#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:209
+#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:215
+#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:220
+#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:228
+#: en/git-stash.txt:284
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
@@ -46965,13 +47344,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:236
+#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:247
+#: en/git-stash.txt:303
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -46986,13 +47365,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:250
+#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:258
+#: en/git-stash.txt:314
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47004,19 +47383,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:260
+#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:265
+#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:276
+#: en/git-stash.txt:332
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
@@ -47031,19 +47410,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-stash.txt:278
+#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:284
+#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
-#: en/git-stash.txt:289
+#: en/git-stash.txt:345
#, no-wrap, priority:240
msgid ""
"git fsck --unreachable |\n"
@@ -47052,7 +47431,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:299
+#: en/git-stash.txt:355
#, ignore-same, priority:240
msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
@@ -48032,7 +48411,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:136
#, ignore-ellipsis, no-wrap, priority:220
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -48210,7 +48589,7 @@ msgstr ""
#. type: delimited block -
#: en/git-submodule.txt:233
#, no-wrap, priority:220
-msgid "git submodule foreach 'echo $path `git rev-parse HEAD`'\n"
+msgid "git submodule foreach 'echo $sm_path `git rev-parse HEAD`'\n"
msgstr ""
#. type: Labeled list
@@ -48488,19 +48867,25 @@ msgid "This option is only valid for the update command. Clone new submodules i
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:437
+#: en/git-submodule.txt:436
+#, priority:220
+msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:445
+#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-submodule.txt:449
+#: en/git-submodule.txt:453
#, ignore-same, priority:220
msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
@@ -51128,7 +51513,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:334
+#: en/git-tag.txt:209 en/git.txt:348
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -51566,311 +51951,323 @@ msgstr ""
#. type: Plain text
#: en/git.txt:116
#, priority:100
-msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:127
+#, priority:100
+msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree. If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
+msgstr ""
+
+#. type: Plain text
+#: en/git.txt:130
+#, priority:100
+msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:117
+#: en/git.txt:131
#, no-wrap, priority:100
msgid "--work-tree=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:124
+#: en/git.txt:138
#, priority:100
msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:125
+#: en/git.txt:139
#, no-wrap, priority:100
msgid "--namespace=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:129
+#: en/git.txt:143
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:130
+#: en/git.txt:144
#, no-wrap, priority:100
msgid "--super-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/git.txt:134
+#: en/git.txt:148
#, priority:100
msgid "Currently for internal use only. Set a prefix which gives a path from above a repository down to its root. One use is to give submodules context about the superproject that invoked it."
msgstr ""
#. type: Plain text
-#: en/git.txt:139
+#: en/git.txt:153
#, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git.txt:140
+#: en/git.txt:154
#, ignore-same, no-wrap, priority:100
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
-#: en/git.txt:143
+#: en/git.txt:157
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:144
+#: en/git.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
-#: en/git.txt:148
+#: en/git.txt:162
#, priority:100
msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:149
+#: en/git.txt:163
#, ignore-same, no-wrap, priority:100
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
-#: en/git.txt:154
+#: en/git.txt:168
#, priority:100
msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:155
+#: en/git.txt:169
#, ignore-same, no-wrap, priority:100
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
-#: en/git.txt:160
+#: en/git.txt:174
#, priority:100
msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
-#: en/git.txt:161
+#: en/git.txt:175
#, ignore-same, no-wrap, priority:100
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
-#: en/git.txt:164
+#: en/git.txt:178
#, priority:100
msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:165
+#: en/git.txt:179
#, ignore-same, no-wrap, priority:100
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
-#: en/git.txt:168
+#: en/git.txt:182
#, priority:100
msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:169
+#: en/git.txt:183
#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr ""
#. type: Plain text
-#: en/git.txt:178
+#: en/git.txt:192
#, priority:100
msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
msgstr ""
#. type: Title -
-#: en/git.txt:180
+#: en/git.txt:194
#, no-wrap, priority:100
msgid "GIT COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git.txt:184
+#: en/git.txt:198
#, priority:100
msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
-#: en/git.txt:186
+#: en/git.txt:200
#, no-wrap, priority:100
msgid "High-level commands (porcelain)"
msgstr ""
#. type: Plain text
-#: en/git.txt:190
+#: en/git.txt:204
#, priority:100
msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
-#: en/git.txt:192
+#: en/git.txt:206
#, no-wrap, priority:100
msgid "Main porcelain commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:197
+#: en/git.txt:211
#, no-wrap, priority:100
msgid "Ancillary Commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:199
+#: en/git.txt:213
#, priority:100
msgid "Manipulators:"
msgstr ""
#. type: Plain text
-#: en/git.txt:203
+#: en/git.txt:217
#, priority:100
msgid "Interrogators:"
msgstr ""
#. type: Title ~
-#: en/git.txt:208
+#: en/git.txt:222
#, no-wrap, priority:100
msgid "Interacting with Others"
msgstr ""
#. type: Plain text
-#: en/git.txt:212
+#: en/git.txt:226
#, priority:100
msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title ~
-#: en/git.txt:216
+#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
msgstr ""
#. type: Plain text
-#: en/git.txt:219
+#: en/git.txt:233
#, priority:100
msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
msgstr ""
#. type: Plain text
-#: en/git.txt:222
+#: en/git.txt:236
#, priority:100
msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:227
+#: en/git.txt:241
#, priority:100
msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
msgstr ""
#. type: Plain text
-#: en/git.txt:231
+#: en/git.txt:245
#, priority:100
msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
msgstr ""
#. type: Plain text
-#: en/git.txt:234
+#: en/git.txt:248
#, priority:100
msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
msgstr ""
#. type: Title -
-#: en/git.txt:237
+#: en/git.txt:251
#, no-wrap, priority:100
msgid "Low-level commands (plumbing)"
msgstr ""
#. type: Plain text
-#: en/git.txt:244
+#: en/git.txt:258
#, priority:100
msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git.txt:251
+#: en/git.txt:265
#, priority:100
msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
-#: en/git.txt:257
+#: en/git.txt:271
#, priority:100
msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
-#: en/git.txt:260
+#: en/git.txt:274
#, no-wrap, priority:100
msgid "Manipulation commands"
msgstr ""
#. type: Title ~
-#: en/git.txt:266
+#: en/git.txt:280
#, no-wrap, priority:100
msgid "Interrogation commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:272
+#: en/git.txt:286
#, priority:100
msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
-#: en/git.txt:275
+#: en/git.txt:289
#, no-wrap, priority:100
msgid "Syncing repositories"
msgstr ""
#. type: Plain text
-#: en/git.txt:281
+#: en/git.txt:295
#, priority:100
msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
-#: en/git.txt:286
+#: en/git.txt:300
#, no-wrap, priority:100
msgid "Internal helper commands"
msgstr ""
#. type: Plain text
-#: en/git.txt:290
+#: en/git.txt:304
#, priority:100
msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
-#: en/git.txt:295
+#: en/git.txt:309
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:300
+#: en/git.txt:314
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:305
+#: en/git.txt:319
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -51879,7 +52276,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:315
+#: en/git.txt:329
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -51889,613 +52286,649 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:321
+#: en/git.txt:335
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:324
+#: en/git.txt:338
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:327
+#: en/git.txt:341
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:328 en/git-unpack-file.txt:23
+#: en/git.txt:342 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:330
+#: en/git.txt:344
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:333
+#: en/git.txt:347
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:336
+#: en/git.txt:350
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:342
+#: en/git.txt:356
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:343
+#: en/git.txt:357
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:348
+#: en/git.txt:362
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:352
+#: en/git.txt:366
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:370
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:358
+#: en/git.txt:372
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:361
+#: en/git.txt:375
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:364
+#: en/git.txt:378
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:365
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:368
+#: en/git.txt:382
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:372
+#: en/git.txt:386
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:378
+#: en/git.txt:392
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:381
+#: en/git.txt:395
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:383
+#: en/git.txt:397
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:400
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:389
+#: en/git.txt:403
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:391
+#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:396
+#: en/git.txt:410
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:398
+#: en/git.txt:412
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:402
+#: en/git.txt:416
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:403
+#: en/git.txt:417
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:407
+#: en/git.txt:421
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:408
+#: en/git.txt:422
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:413
+#: en/git.txt:427
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:414
+#: en/git.txt:428
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:419
+#: en/git.txt:433
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:420
+#: en/git.txt:434
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:426
+#: en/git.txt:440
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:432
+#: en/git.txt:446
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:433
+#: en/git.txt:447
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:438
+#: en/git.txt:452
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:439
+#: en/git.txt:453
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:443
+#: en/git.txt:457
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:444
+#: en/git.txt:458
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:447
+#: en/git.txt:461
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:448
+#: en/git.txt:462
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:462
+#: en/git.txt:476
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:463
+#: en/git.txt:477
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:472
+#: en/git.txt:486
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:473
+#: en/git.txt:487
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:481
+#: en/git.txt:495
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
-#: en/git.txt:483
+#: en/git.txt:497
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:484
+#: en/git.txt:498
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
+#. type: Plain text
+#: en/git.txt:502
+#, priority:100
+msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:485
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
+#. type: Plain text
+#: en/git.txt:507
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:486
+#: en/git.txt:508
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
+#. type: Plain text
+#: en/git.txt:511
+#, priority:100
+msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
+#. type: Plain text
+#: en/git.txt:516
+#, priority:100
+msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:488
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
+#. type: Plain text
+#: en/git.txt:521
+#, priority:100
+msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
+msgstr ""
+
#. type: Labeled list
-#: en/git.txt:489
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
-#. type: Labeled list
-#: en/git.txt:490
-#, no-wrap, priority:100
-msgid "'EMAIL'"
+#. type: Plain text
+#: en/git.txt:525
+#, priority:100
+msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+#. type: Labeled list
+#: en/git.txt:526
+#, ignore-same, no-wrap, priority:100
+msgid "`EMAIL`"
+msgstr "`EMAIL`"
+
#. type: Plain text
-#: en/git.txt:492
+#: en/git.txt:529
#, priority:100
-msgid "see linkgit:git-commit-tree[1]"
+msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:494
+#: en/git.txt:531
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:495
+#: en/git.txt:532
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:500
+#: en/git.txt:537
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:501
+#: en/git.txt:538
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:506
+#: en/git.txt:543
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:545
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:510
+#: en/git.txt:547
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:511
+#: en/git.txt:548
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:512
+#: en/git.txt:549
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the"
msgstr ""
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
-#: en/git.txt:513
+#: en/git.txt:550
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:514
+#: en/git.txt:551
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:551
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:515
+#: en/git.txt:552
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:521
+#: en/git.txt:558
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:524
+#: en/git.txt:561
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:564
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:565
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:530
+#: en/git.txt:567
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:531
+#: en/git.txt:568
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:533
+#: en/git.txt:570
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:536
+#: en/git.txt:573
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:540
+#: en/git.txt:577
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:541
+#: en/git.txt:578
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:546
+#: en/git.txt:583
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:547
+#: en/git.txt:584
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:550
+#: en/git.txt:587
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:551
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:556
+#: en/git.txt:593
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:594
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:558
+#: en/git.txt:595
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:565
+#: en/git.txt:602
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:571
+#: en/git.txt:608
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:575
+#: en/git.txt:612
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:576
+#: en/git.txt:613
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:581
+#: en/git.txt:618
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:582
+#: en/git.txt:619
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:588
+#: en/git.txt:625
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:589
+#: en/git.txt:626
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:592
+#: en/git.txt:629
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:593
+#: en/git.txt:630
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:600
+#: en/git.txt:637
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:638
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:611
+#: en/git.txt:648
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -52510,523 +52943,523 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:612
+#: en/git.txt:649
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:615
+#: en/git.txt:652
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:619 en/git.txt:697
+#: en/git.txt:656 en/git.txt:734
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:624 en/git.txt:702
+#: en/git.txt:661 en/git.txt:739
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:629
+#: en/git.txt:666
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:632 en/git.txt:719
+#: en/git.txt:669 en/git.txt:756
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:633
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:636
+#: en/git.txt:673
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:637
+#: en/git.txt:674
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:680
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:681
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:650
+#: en/git.txt:687
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:651
+#: en/git.txt:688
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:695
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:661
+#: en/git.txt:698
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:662
+#: en/git.txt:699
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:666
+#: en/git.txt:703
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:667
+#: en/git.txt:704
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:671
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:672
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:676
+#: en/git.txt:713
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:677
+#: en/git.txt:714
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:684
+#: en/git.txt:721
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:685
+#: en/git.txt:722
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:688
+#: en/git.txt:725
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:689
+#: en/git.txt:726
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:730
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:711
+#: en/git.txt:748
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:716
+#: en/git.txt:753
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:722
+#: en/git.txt:759
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:724
+#: en/git.txt:761
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:766
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:767
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:773
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:737
+#: en/git.txt:774
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
#. type: Plain text
-#: en/git.txt:742
+#: en/git.txt:779
#, priority:100
msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
msgstr ""
#. type: Labeled list
-#: en/git.txt:743
+#: en/git.txt:780
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:751
+#: en/git.txt:788
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:752
+#: en/git.txt:789
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:755
+#: en/git.txt:792
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:756
+#: en/git.txt:793
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:796
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:760
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:800
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:764
+#: en/git.txt:801
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:773
+#: en/git.txt:810
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:774
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:784
+#: en/git.txt:821
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:785
+#: en/git.txt:822
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:793
+#: en/git.txt:830
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:794
+#: en/git.txt:831
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:800
+#: en/git.txt:837
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:801
+#: en/git.txt:838
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:843
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:814
+#: en/git.txt:851
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:815
+#: en/git.txt:852
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:816
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:854
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:864
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:832
+#: en/git.txt:869
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:833
+#: en/git.txt:870
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:841
+#: en/git.txt:878
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:843
+#: en/git.txt:880
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:848
+#: en/git.txt:885
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:855
+#: en/git.txt:892
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:860
+#: en/git.txt:897
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:865
+#: en/git.txt:902
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:871
+#: en/git.txt:908
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:874
+#: en/git.txt:911
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:918
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:890
+#: en/git.txt:927
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:894
+#: en/git.txt:931
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:896
+#: en/git.txt:933
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:901
+#: en/git.txt:938
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:942
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:907
+#: en/git.txt:944
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:910
+#: en/git.txt:947
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:913
+#: en/git.txt:950
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:916
+#: en/git.txt:953
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:919
+#: en/git.txt:956
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:961
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:928
+#: en/git.txt:965
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:930
+#: en/git.txt:967
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:974
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:940
+#: en/git.txt:977
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:985
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -54006,7 +54439,19 @@ msgid "The untracked cache extension can be enabled by the `core.untrackedCache`
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:557
+#: en/git-update-index.txt:561
+#, priority:100
+msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked. This does not work as expected, since Git may still check working tree files against the index when performing certain operations. In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:567
+#, priority:100
+msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified. The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:573
#, ignore-same, priority:100
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
@@ -58348,7 +58793,7 @@ msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
#, fuzzy, priority:260
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
@@ -58783,185 +59228,197 @@ msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:229
#, ignore-same, no-wrap, priority:260
+msgid "'%GT'"
+msgstr "'%GT'"
+
+#. type: Plain text
+#: en/pretty-formats.txt:230
+#, priority:260
+msgid "show the trust level for the key used to sign a signed commit"
+msgstr ""
+
+#. type: Labeled list
+#: en/pretty-formats.txt:230
+#, ignore-same, no-wrap, priority:260
msgid "'%gD'"
msgstr "'%gD'"
#. type: Plain text
-#: en/pretty-formats.txt:230
+#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, ignore-same, no-wrap, priority:260
msgid "'%gd'"
msgstr "'%gd'"
#. type: Plain text
-#: en/pretty-formats.txt:235
+#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:237
+#: en/pretty-formats.txt:238
#, ignore-same, no-wrap, priority:260
msgid "'%gn'"
msgstr "'%gn'"
#. type: Plain text
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:238
+#: en/pretty-formats.txt:239
#, ignore-same, no-wrap, priority:260
msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:239
+#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:240
+#: en/pretty-formats.txt:241
#, ignore-same, no-wrap, priority:260
msgid "'%ge'"
msgstr "'%ge'"
#. type: Plain text
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:241
+#: en/pretty-formats.txt:242
#, ignore-same, no-wrap, priority:260
msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:242
+#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:243
+#: en/pretty-formats.txt:244
#, ignore-same, no-wrap, priority:260
msgid "'%gs'"
msgstr "'%gs'"
#. type: Plain text
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, priority:260
msgid "reflog subject"
msgstr ""
#. type: Labeled list
-#: en/pretty-formats.txt:244
+#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:245
+#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:257
+#: en/pretty-formats.txt:258
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:263
+#: en/pretty-formats.txt:264
#, priority:260
msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:272
+#: en/pretty-formats.txt:273
#, priority:260
msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:276
+#: en/pretty-formats.txt:277
#, priority:260
msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:278
+#: en/pretty-formats.txt:279
#, priority:260
msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:285
+#: en/pretty-formats.txt:286
#, priority:260
msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:289
+#: en/pretty-formats.txt:290
#, priority:260
msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:293
+#: en/pretty-formats.txt:294
#, priority:260
msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:297
+#: en/pretty-formats.txt:298
#, priority:260
msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:299
+#: en/pretty-formats.txt:300
#, priority:260
msgid "'tformat:'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:307
+#: en/pretty-formats.txt:308
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:313
+#: en/pretty-formats.txt:314
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=format:%h 4da45bef \\\n"
@@ -58971,7 +59428,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:318
+#: en/pretty-formats.txt:319
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
@@ -58981,13 +59438,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:323
+#: en/pretty-formats.txt:324
#, priority:260
msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
-#: en/pretty-formats.txt:327
+#: en/pretty-formats.txt:328
#, no-wrap, priority:260
msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
--
GitLab